/ Check-in [3ed49691]
Login

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

Overview
Comment:Merge all recent enhancements from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 3ed49691a12455e8583d8b8394ab005124442e89
User & Date: drh 2016-01-20 11:40:31
Context
2016-02-02
02:30
Merge recent enhancements from trunk. check-in: e6a4a163 user: drh tags: apple-osx
2016-01-20
11:40
Merge all recent enhancements from trunk. check-in: 3ed49691 user: drh tags: apple-osx
08:47
Improve performance of sqlite3VtabImportErrmsg(). check-in: 18d61c8e user: dan tags: trunk
2016-01-14
15:03
Merge the latest enhancements and fixes from trunk. check-in: d85774e0 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_buffer.c.

Changes to ext/fts5/fts5_config.c.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_index.c.

Changes to ext/fts5/fts5_main.c.

Changes to ext/fts5/fts5_storage.c.

Changes to ext/fts5/fts5_tcl.c.

Added ext/fts5/fts5_test_tok.c.

Changes to ext/fts5/fts5_vocab.c.

Changes to ext/fts5/test/fts5_common.tcl.

Added ext/fts5/test/fts5bigtok.test.

Changes to ext/fts5/test/fts5config.test.

Changes to ext/fts5/test/fts5fault4.test.

Changes to ext/fts5/test/fts5fault5.test.

Changes to ext/fts5/test/fts5fault8.test.

Added ext/fts5/test/fts5fault9.test.

Changes to ext/fts5/test/fts5hash.test.

Changes to ext/fts5/test/fts5integrity.test.

Added ext/fts5/test/fts5merge2.test.

Changes to ext/fts5/test/fts5rowid.test.

Changes to ext/fts5/test/fts5simple2.test.

Changes to ext/fts5/test/fts5synonym.test.

Changes to ext/fts5/test/fts5synonym2.test.

Added ext/fts5/test/fts5tok1.test.

Added ext/fts5/test/fts5tok2.test.

Added ext/fts5/test/fts5update.test.

Changes to ext/fts5/test/fts5vocab.test.

Changes to main.mk.

Changes to src/analyze.c.

Changes to src/attach.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/callback.c.

Changes to src/date.c.

Changes to src/expr.c.

Changes to src/insert.c.

Changes to src/main.c.

Changes to src/malloc.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/sqliteInt.h.

Changes to src/trigger.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vdbeblob.c.

Changes to src/vdbemem.c.

Changes to src/vtab.c.

Changes to src/wherecode.c.

Changes to src/whereexpr.c.

Changes to test/threadtest3.c.