/ Check-in [35b1b8d4]
Login

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

Overview
Comment:Merge the 3.8.12 beta changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sessions
Files: files | file ages | folders
SHA1: 35b1b8d4b97715030700e37b292bb4f1bb3f44d6
User & Date: drh 2015-10-08 14:55:30
Context
2015-10-09
15:29
Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5 into the amalgamation from trunk. check-in: c1d96fb6 user: drh tags: sessions
2015-10-08
14:55
Merge the 3.8.12 beta changes from trunk. check-in: 35b1b8d4 user: drh tags: sessions
02:44
Remove two unused lines of code - discovered by scan-build. check-in: 77b707b7 user: drh tags: trunk
2015-10-01
16:35
Changes to the sesssions module ensure that tables appear within changesets and patchsets in the same order that they were attached to the sessions object. check-in: 76958902 user: dan tags: sessions
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_write.c.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_buffer.c.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_index.c.

Changes to ext/fts5/fts5_main.c.

Changes to ext/fts5/fts5_storage.c.

Changes to ext/fts5/fts5_vocab.c.

Changes to ext/fts5/fts5parse.y.

Changes to ext/fts5/test/fts5al.test.

Added ext/fts5/test/fts5onepass.test.

Added ext/fts5/test/fts5phrase.test.

Changes to ext/fts5/test/fts5prefix.test.

Changes to ext/fts5/test/fts5simple.test.

Added ext/fts5/tool/fts5txt2db.tcl.

Changes to ext/rtree/rtree1.test.

Changes to src/mutex_w32.c.

Changes to src/pragma.c.

Changes to src/select.c.

Changes to src/sqliteInt.h.

Changes to src/vdbe.c.

Changes to src/vtab.c.

Changes to src/whereexpr.c.

Changes to test/fts3expr3.test.

Added test/offset1.test.

Changes to test/spellfix2.test.

Changes to test/uri.test.

Deleted tool/diffdb.c.

Deleted tool/opcodeDoc.awk.

Deleted tool/space_used.tcl.