/ Check-in [84f09f00]
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:84f09f00f8731b1b3e057bc629ec14103a44b81d
User & Date: drh 2016-03-07 20:48:49
Context
2016-03-07
21:28
Fix a typo and remove an unused variable from test logic. check-in: 9f31516c user: drh tags: apple-osx
20:48
Merge recent enhancements from trunk. check-in: 84f09f00 user: drh tags: apple-osx
20:14
Update fts3/4 so that the 'merge=X,0' command merges X pages from all segments of the first level in the fts index that contains 2 or more segments. check-in: cddf69db user: dan tags: trunk
2016-03-04
14:57
Merge recent enhancements from trunk, and especially the changes that reduce the heap-memory footprint of schemas, and defer opening and writing to statement journals. check-in: 2f0c195c user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to ext/fts3/fts3_write.c.

Changes to ext/rtree/rtree.c.

Changes to main.mk.

Changes to src/global.c.

Deleted src/journal.c.

Changes to src/main.c.

Changes to src/memjournal.c.

Changes to src/pager.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/test_bestindex.c.

Changes to src/util.c.

Changes to src/where.c.

Changes to src/wherecode.c.

Added test/bestindex2.test.

Changes to test/fts4merge.test.

Added test/fts4opt.test.

Changes to tool/mksqlite3c.tcl.