/ Check-in [f2e15b19]
Login

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

Overview
Comment:Merge all changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | nextgen-query-plan-exp
Files: files | file ages | folders
SHA1: f2e15b1974e55373b5819e3b2326653f890f409f
User & Date: drh 2013-06-12 17:17:45
Context
2013-06-12
17:55
Bug fixes in the handling of virtual tables. check-in: 25c0f729 user: drh tags: nextgen-query-plan-exp
17:17
Merge all changes from trunk. check-in: f2e15b19 user: drh tags: nextgen-query-plan-exp
17:08
"make test" now passing. check-in: addd7f46 user: drh tags: nextgen-query-plan-exp
2013-06-11
14:22
Add the SQLITE_FTS3_MAX_EXPR_DEPTH compile time option. check-in: 24fc9d44 user: dan tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_unicode2.c.

Changes to ext/fts3/unicode/mkunicode.tcl.

Changes to src/build.c.

Changes to src/where.c.

Changes to test/collate1.test.

Changes to test/fts4unicode.test.

Changes to tool/build-all-msvc.bat.