/ Check-in [ec052b4f]
Login

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

Overview
Comment:Merge recent enhancements from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: ec052b4f14a8a7019bfc1bbe474020abafa557f3
User & Date: drh 2016-03-18 00:58:39
Context
2016-03-18
11:03
Test case tweaks to better support the Apple configuration options. check-in: cb0ffe84 user: drh tags: apple-osx
00:58
Merge recent enhancements from trunk. check-in: ec052b4f user: drh tags: apple-osx
00:39
Fix FTS5 so that it works with SQLITE_OMIT_AUTORESET. check-in: b199637d user: drh tags: trunk
2016-03-16
01:09
Merge the SQLITE_OMIT_CODEC_FROM_TCL compile-time option from trunk. check-in: 161d91e4 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_storage.c.

Changes to src/expr.c.

Changes to src/os_unix.c.

Changes to src/pragma.c.

Changes to src/test1.c.

Changes to src/test_config.c.

Changes to src/vdbe.h.

Changes to src/vdbeaux.c.

Changes to src/where.c.

Changes to test/capi3.test.

Changes to test/capi3c.test.

Changes to test/intpkey.test.

Changes to test/memsubsys1.test.

Changes to test/mutex1.test.

Changes to test/releasetest.tcl.

Changes to test/wal2.test.

Changes to test/wal3.test.

Changes to tool/lemon.c.

Changes to tool/lempar.c.

Changes to tool/sqldiff.c.