/ Check-in [1c68687a]
Login

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

Overview
Comment:Merge auto-incr-merge with incr-merge branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts4-incr-merge
Files: files | file ages | folders
SHA1:1c68687ab6d05b100191663820e7d82377d52445
User & Date: dan 2012-03-24 14:45:59
Context
2012-03-24
16:11
Remove the Fts3Table.mxLevel variable. check-in: 67a0cffc user: dan tags: fts4-incr-merge
14:45
Merge auto-incr-merge with incr-merge branch. check-in: 1c68687a user: dan tags: fts4-incr-merge
14:45
Modify the way the number of leaves written and the maximum relative level are calculated in the auto-incr-merge code. Closed-Leaf check-in: 0d841c95 user: dan tags: fts4-auto-incr-merge
2012-03-23
18:26
Fix a spurious SQLITE_CONSTRAINT error that may be returned by an incr-merge operation. check-in: ed7c17ea user: dan 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_write.c.

Changes to test/bc_common.tcl.