/ Check-in [f12b8a0f]
Login

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

Overview
Comment:Merge trunk enhancements into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: f12b8a0f7958260cb8e6b9be1aaa583cf383b39c
User & Date: drh 2015-09-15 17:20:41
Context
2015-09-24
14:43
Merge recent trunk enhancements into the apple-osx branch. check-in: 4dd06d8b user: drh tags: apple-osx
2015-09-15
17:20
Merge trunk enhancements into the apple-osx branch. check-in: f12b8a0f user: drh tags: apple-osx
14:39
Add test cases to cover fts5 integrity-check code. check-in: 1d018c35 user: dan tags: trunk
2015-09-03
14:31
Merge enhancements from trunk. check-in: d01658ad user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts5/extract_api_docs.tcl.

Changes to ext/fts5/fts5.h.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_aux.c.

Changes to ext/fts5/fts5_buffer.c.

Changes to ext/fts5/fts5_config.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_tcl.c.

Changes to ext/fts5/fts5_test_mi.c.

Changes to ext/fts5/fts5_tokenize.c.

Changes to ext/fts5/test/fts5_common.tcl.

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

Changes to ext/fts5/test/fts5ad.test.

Changes to ext/fts5/test/fts5ah.test.

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

Changes to ext/fts5/test/fts5columnsize.test.

Changes to ext/fts5/test/fts5corrupt.test.

Changes to ext/fts5/test/fts5corrupt2.test.

Changes to ext/fts5/test/fts5corrupt3.test.

Changes to ext/fts5/test/fts5dlidx.test.

Changes to ext/fts5/test/fts5ea.test.

Changes to ext/fts5/test/fts5eb.test.

Changes to ext/fts5/test/fts5fault6.test.

Added ext/fts5/test/fts5fault7.test.

Changes to ext/fts5/test/fts5matchinfo.test.

Changes to ext/fts5/test/fts5rowid.test.

Added ext/fts5/test/fts5simple.test.

Added ext/fts5/test/fts5synonym.test.

Changes to ext/fts5/test/fts5version.test.

Changes to ext/fts5/tool/loadfts5.tcl.

Changes to ext/fts5/tool/showfts5.tcl.

Changes to ext/misc/json1.c.

Changes to main.mk.

Changes to src/analyze.c.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/date.c.

Changes to src/dbstat.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/func.c.

Changes to src/insert.c.

Changes to src/lempar.c.

Changes to src/loadext.c.

Changes to src/malloc.c.

Changes to src/mutex.c.

Changes to src/mutex_unix.c.

Changes to src/mutex_w32.c.

Changes to src/pager.c.

Changes to src/pcache.c.

Changes to src/pcache1.c.

Changes to src/resolve.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqlite3ext.h.

Changes to src/sqliteInt.h.

Changes to src/test_func.c.

Changes to src/tokenize.c.

Changes to src/treeview.c.

Changes to src/update.c.

Changes to src/vdbe.c.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeblob.c.

Changes to src/vdbemem.c.

Changes to src/wal.c.

Changes to src/where.c.

Changes to src/whereInt.h.

Changes to src/wherecode.c.

Changes to src/whereexpr.c.

Changes to test/delete.test.

Added test/delete4.test.

Changes to test/e_createtable.test.

Changes to test/e_delete.test.

Changes to test/e_expr.test.

Changes to test/e_insert.test.

Changes to test/e_reindex.test.

Changes to test/e_resolve.test.

Changes to test/e_update.test.

Changes to test/fkey5.test.

Changes to test/index.test.

Changes to test/index2.test.

Changes to test/index3.test.

Changes to test/indexedby.test.

Added test/indexexpr1.test.

Changes to test/json101.test.

Added test/json102.test.

Changes to test/pragma.test.

Changes to test/pragma2.test.

Changes to test/releasetest.tcl.

Changes to test/rowid.test.

Added test/subtype1.test.

Changes to test/tabfunc01.test.

Changes to test/table.test.

Changes to test/where.test.

Changes to test/where4.test.

Changes to tool/lemon.c.

Changes to tool/lempar.c.

Changes to tool/spaceanal.tcl.