/ Check-in [1c78d892]
Login

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

Overview
Comment:Merge latest trunk changes with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts5
Files: files | file ages | folders
SHA1:1c78d8920fb59da3cb97dd2eb09b3e08dfd14259
User & Date: dan 2015-04-24 20:18:21
Context
2015-04-25
18:56
Add tests for fts5. check-in: e748651c user: dan tags: fts5
2015-04-24
20:18
Merge latest trunk changes with this branch. check-in: 1c78d892 user: dan tags: fts5
19:41
Add the "unindexed" column option to fts5. check-in: 86309961 user: dan tags: fts5
18:31
Fix fuzzershell so that it works with SQLITE_OMIT_TRACE. check-in: dc88fe7e user: drh tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3_write.c.

Changes to ext/fts5/fts5_config.c.

Changes to main.mk.

Changes to src/expr.c.

Changes to src/resolve.c.

Changes to test/fts4check.test.

Added test/fuzzdata1.txt.

Changes to test/releasetest.tcl.

Changes to test/resolver01.test.

Changes to test/trace2.test.

Changes to tool/fuzzershell.c.