/ Check-in [d7381eff]
Login

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

Overview
Comment:Merge 3.12.0 changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | begin-concurrent
Files: files | file ages | folders
SHA1: d7381efff47c0a2f307478f196d03df7534f19e3
User & Date: drh 2016-03-29 10:36:07
Wiki:begin-concurrent
Context
2016-04-20
12:16
Merge all recent enhancements from trunk. check-in: 1f709fbf user: drh tags: begin-concurrent
2016-03-29
10:36
Merge 3.12.0 changes. check-in: d7381eff user: drh tags: begin-concurrent
10:14
Version 3.12.0 check-in: e9bb4cf4 user: drh tags: trunk, release, version-3.12.0
2016-03-21
15:54
Merge all recent changes from trunk. check-in: 8ee7d346 user: drh tags: begin-concurrent
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_index.c.

Changes to ext/fts5/fts5_storage.c.

Changes to ext/fts5/test/fts5aa.test.

Added ext/fts5/test/fts5determin.test.

Changes to ext/fts5/test/fts5fault4.test.

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

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/main.c.

Changes to src/memjournal.c.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pragma.c.

Changes to src/select.c.

Changes to src/sqliteInt.h.

Changes to src/sqliteLimit.h.

Changes to src/test_multiplex.c.

Changes to src/util.c.

Changes to src/vdbe.c.

Changes to src/vtab.c.

Changes to test/capi3.test.

Changes to test/capi3c.test.

Changes to test/fuzzcheck.c.

Changes to test/memsubsys1.test.

Changes to test/nolock.test.

Changes to test/shell1.test.

Changes to test/shell2.test.

Changes to test/shell3.test.

Changes to test/snapshot.test.

Changes to test/snapshot_fault.test.