/ Check-in [4d6de3e9]
Login

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

Overview
Comment:Merge fts4-incr-merge with trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4d6de3e9bef3487f2d89167939ab2c42872d05b3
User & Date: dan 2012-03-29 15:11:32
Context
2012-03-30
00:00
Fix compiler warnings on GCC and MSVC and fix a C89-ism that broke the build for MSVC. check-in: b451c0f9 user: drh tags: trunk
2012-03-29
15:11
Merge fts4-incr-merge with trunk. check-in: 4d6de3e9 user: dan tags: trunk
14:29
Disable the LIKE optimization if the column on the left-hand-side of the LIKE operator belongs to a virtual table. check-in: 0bacb879 user: dan tags: trunk
2012-03-28
16:44
Merge in the latest changes from trunk. Closed-Leaf check-in: 66c4aaad user: drh tags: fts4-incr-merge
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_snippet.c.

Changes to ext/fts3/fts3_write.c.

Added ext/fts3/tool/fts3view.c.

Changes to test/backcompat.test.

Added test/bc_common.tcl.

Changes to test/fts3_common.tcl.

Added test/fts4check.test.

Changes to test/fts4langid.test.

Added test/fts4merge.test.

Added test/fts4merge2.test.

Added test/fts4merge3.test.

Changes to test/permutations.test.

Changes to test/trace2.test.