/ Check-in [959677b9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge recent changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | rowvalue
Files: files | file ages | folders
SHA1:959677b97ba15f786936c762e2e68df1151d7ed0
User & Date: drh 2016-08-11 12:31:21
Context
2016-08-12
11:01
Fix a post-OOM memory leak. check-in: 14009b32 user: drh tags: rowvalue
2016-08-11
12:31
Merge recent changes from trunk. check-in: 959677b9 user: drh tags: rowvalue
12:01
Fix some problems with handling "no such collation sequence" errors. check-in: 8278be06 user: dan tags: rowvalue
09:55
Fix a 1 byte buffer overwrite in the "sqldiff --rbu" command. check-in: ab83d707 user: dan tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to VERSION.

Changes to configure.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_index.c.

Changes to ext/fts5/fts5parse.y.

Added ext/fts5/test/fts5colset.test.

Changes to src/pcache1.c.

Changes to src/tokenize.c.

Changes to src/walker.c.

Changes to src/whereexpr.c.

Changes to tool/lemon.c.

Changes to tool/lempar.c.

Changes to tool/sqldiff.c.