/ Check-in [567dd843]

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

Comment:Merge the latest trunk changes into the fts3-prefix-search branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts3-prefix-search
Files: files | file ages | folders
SHA1: 567dd84359218245d4e6887547e2a48881f2c8e0
User & Date: drh 2011-06-06 18:14:25
Have NEAR queries use incremental merging. Fix issues surrounding the deferred token optimization. (check-in: 9d10a684 user: dan tags: fts3-prefix-search)
Merge the latest trunk changes into the fts3-prefix-search branch. (check-in: 567dd843 user: drh tags: fts3-prefix-search)
Modify fts3rnd.test to run tests for both "ORDER BY docid ASC" and "ORDER BY docid DESC" with both order=ASC and order=DESC FTS tables. Fixes for some bugs found. (check-in: 89f2f482 user: dan tags: fts3-prefix-search)
Add assert() statements to verify that u16 pointers associated with the enhancement in [897f56a158] are always 2-byte aligned. (check-in: 98ccfa93 user: drh tags: trunk)
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3_aux.c.

Changes to ext/rtree/rtree.c.

Changes to src/alter.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/main.c.

Changes to src/os_unix.c.

Changes to src/pcache.c.

Changes to src/pragma.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/test1.c.

Changes to src/tokenize.c.

Changes to src/trigger.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vdbeblob.c.

Changes to src/vtab.c.

Changes to src/wal.c.

Changes to test/e_uri.test.

Changes to test/lock_common.tcl.

Changes to test/tkt-2d1a5c67d.test.

Added test/walro.test.

Added tool/build-shell.sh.

Changes to tool/lemon.c.

Changes to tool/shell1.test.

Added tool/symbols.sh.

Added tool/warnings.sh.