/ Check-in [0f707d15]
Login

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

Overview
Comment:Merge changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 0f707d1532d6c8277cf0f70821a83e0af621ce9b
User & Date: drh 2016-06-15 10:21:06
Context
2016-07-25
17:31
Merge 3.14 alpha changes from trunk. check-in: e98cefb1 user: drh tags: apple-osx
2016-06-15
10:21
Merge changes from trunk. check-in: 0f707d15 user: drh tags: apple-osx
2016-06-13
19:58
Fix RBU so that it builds with -DSQLITE_ENABLE_8_3_NAMES. Fix "PRAGMA compile_options" for SQLITE_ENABLE_8_3_NAMES such that it reports the numeric setting: "1" or "2". check-in: 0230ca17 user: drh tags: trunk
2016-05-23
02:57
Merge changes from trunk. check-in: 815cc2bb user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to autoconf/configure.ac.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_main.c.

Changes to ext/fts5/test/fts5rank.test.

Added ext/misc/csv.c.

Added ext/misc/vfsstat.c.

Changes to ext/rbu/rbu_common.tcl.

Changes to ext/rbu/rbuvacuum.test.

Added ext/rbu/rbuvacuum2.test.

Changes to ext/rbu/sqlite3rbu.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree1.test.

Changes to ext/rtree/rtree3.test.

Changes to ext/rtree/rtreeC.test.

Added ext/rtree/rtreeG.test.

Changes to main.mk.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/ctime.c.

Changes to src/dbstat.c.

Changes to src/expr.c.

Changes to src/fkey.c.

Changes to src/func.c.

Changes to src/loadext.c.

Changes to src/os_win.c.

Changes to src/parse.y.

Changes to src/pragma.c.

Changes to src/select.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Changes to src/test3.c.

Changes to src/test6.c.

Changes to src/treeview.c.

Changes to src/vdbe.c.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vdbeblob.c.

Changes to src/vdbemem.c.

Changes to src/vtab.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.

Added test/bestindex3.test.

Added test/csv01.test.

Changes to test/ctime.test.

Changes to test/index6.test.

Changes to test/misc5.test.

Changes to test/speedtest1.c.

Changes to test/stat.test.

Changes to test/tclsqlite.test.

Added test/walcrash4.test.

Added tool/dbhash.c.

Changes to tool/lemon.c.

Changes to tool/lempar.c.

Added tool/libvers.c.