/ Check-in [72f39efa]
Login

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

Overview
Comment:Merge latest trunk changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | begin-concurrent-pnu
Files: files | file ages | folders
SHA3-256: 72f39efa9b1b97a54fe35d005b48f7e8b57d6285ba42f36487f796e09c710958
User & Date: dan 2018-05-15 11:55:15
Context
2018-06-06
17:12
Merge the 3.24.0 changes plus a few subsequent enhancements. check-in: be7004a9 user: drh tags: begin-concurrent-pnu
2018-05-15
11:55
Merge latest trunk changes into this branch. check-in: 72f39efa user: dan tags: begin-concurrent-pnu
11:45
Merge latest trunk changes with this branch. check-in: ae86cf60 user: dan tags: begin-concurrent
11:33
Instead of just the flags byte, include the first 8 bytes of the relevant page in an on-commit conflict log message. check-in: 52e443eb user: dan tags: begin-concurrent-pnu
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to autoconf/Makefile.am.

Changes to autoconf/configure.ac.

Changes to ext/expert/expert1.test.

Changes to ext/expert/sqlite3expert.c.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts5/test/fts5plan.test.

Changes to ext/fts5/test/fts5unicode.test.

Changes to ext/misc/closure.c.

Changes to ext/misc/templatevtab.c.

Changes to ext/rbu/rbu1.test.

Changes to ext/rbu/rbu_common.tcl.

Added ext/rbu/rbusplit.test.

Changes to ext/rbu/sqlite3rbu.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree6.test.

Changes to ext/rtree/rtreeC.test.

Changes to main.mk.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/expr.c.

Changes to src/func.c.

Changes to src/loadext.c.

Changes to src/main.c.

Changes to src/mutex.c.

Changes to src/os_win.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/printf.c.

Changes to src/select.c.

Changes to src/shell.c.in.

Changes to src/sqlite.h.in.

Changes to src/sqlite3ext.h.

Changes to src/sqliteInt.h.

Changes to src/test1.c.

Changes to src/treeview.c.

Changes to src/update.c.

Changes to src/vacuum.c.

Changes to src/vdbe.h.

Changes to src/vdbeaux.c.

Changes to src/vdbetrace.c.

Changes to src/where.c.

Changes to src/whereInt.h.

Changes to src/wherecode.c.

Changes to test/analyze3.test.

Changes to test/analyze4.test.

Changes to test/analyze6.test.

Changes to test/analyze7.test.

Changes to test/analyze8.test.

Changes to test/analyze9.test.

Changes to test/analyzeA.test.

Changes to test/analyzeD.test.

Changes to test/analyzeF.test.

Changes to test/autoindex1.test.

Changes to test/autoindex3.test.

Changes to test/autoindex5.test.

Changes to test/bestindex1.test.

Changes to test/bestindex2.test.

Changes to test/bestindex3.test.

Changes to test/bigmmap.test.

Changes to test/closure01.test.

Changes to test/cost.test.

Changes to test/coveridxscan.test.

Changes to test/e_createtable.test.

Changes to test/eqp.test.

Changes to test/fts3aux1.test.

Changes to test/fts3expr.test.

Changes to test/fts3expr4.test.

Changes to test/fts3join.test.

Changes to test/fts3query.test.

Changes to test/fuzz_malloc.test.

Changes to test/fuzzcheck.c.

Changes to test/fuzzdata5.db.

Added test/fuzzdata6.db.

Changes to test/index6.test.

Changes to test/index7.test.

Changes to test/indexedby.test.

Changes to test/indexexpr2.test.

Changes to test/join2.test.

Changes to test/join5.test.

Changes to test/mallocK.test.

Changes to test/orderby1.test.

Changes to test/pager1.test.

Added test/resetdb.test.

Changes to test/rollback2.test.

Changes to test/rowvalue.test.

Changes to test/rowvalue4.test.

Changes to test/scanstatus.test.

Changes to test/selectA.test.

Changes to test/selectD.test.

Changes to test/shell1.test.

Changes to test/skipscan2.test.

Changes to test/skipscan6.test.

Changes to test/soak.test.

Changes to test/tester.tcl.

Changes to test/tkt-385a5b56b9.test.

Changes to test/tkt-78e04e52ea.test.

Changes to test/tkt-b75a9ca6b0.test.

Changes to test/tkt3442.test.

Changes to test/tpch01.test.

Changes to test/trigger1.test.

Changes to test/unordered.test.

Changes to test/where3.test.

Changes to test/where7.test.

Changes to test/where9.test.

Changes to test/whereG.test.

Changes to test/whereI.test.

Changes to test/whereJ.test.

Changes to test/wherelimit.test.

Changes to test/with1.test.

Changes to test/with3.test.

Changes to test/without_rowid1.test.