Merge the latest fixes and enhancements from trunk.

FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c

diff --cc Makefile.in
index 9451af42021b903aa1714058fb230c4d81aaf688,2782e765f597c7a687c4cebc00728e6cb9b952ac..8910209ce5bcee058896b93344df2d34164ba693
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -181,8 -179,7 +181,8 @@@ LIBOBJS0 = alter.lo analyze.lo attach.l
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
           pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
 -         random.lo resolve.lo rowset.lo rtree.lo select.lo sqlite3rbu.lo status.lo \
 +         random.lo resolve.lo rowset.lo rtree.lo \
-          sqlite3session.lo select.lo status.lo \
++         sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
           table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
           update.lo util.lo vacuum.lo \
           vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \

diff --cc Makefile.msc
index 001a30be73bcda28e7b7cf469c2821e76256f45c,0eb660adc71851eab86ba72df9c9b66fc4ae2b8e..b627bee81caf9620beaa920f14b358fbd3d71d77
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -849,8 -839,7 +849,8 @@@ LIBOBJS0 = vdbe.lo parse.lo alter.lo an
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
           pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
 -         random.lo resolve.lo rowset.lo rtree.lo select.lo sqlite3rbu.lo status.lo \
 +         random.lo resolve.lo rowset.lo rtree.lo \
-          sqlite3session.lo select.lo status.lo \
++         sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
           table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
           update.lo util.lo vacuum.lo \
           vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \

diff --cc manifest
index f98559986f69720c8e113d797ab1df9c42c10d26,1354db7a40cdc0da16e48becf6754e4acb76e67d..c13c8d974c8c860b141ca7b10e35f90438899750
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements,\sand\sespecially\sthe\sWAL\soverwrite\schange,\sfrom\strunk.
- D 2016-01-11T13:10:41.337
- F Makefile.in e3c1e13b4eba06cbb7f9295148383b7e284596be
 -C Yet\sanother\schange\sto\sFTS5\strying\sto\sget\sit\sto\smerge\ssuccessfully\sinto\ssessions.
 -D 2016-01-14T14:33:36.733
 -F Makefile.in cfa1ac03c4b414992fd53f24d978b45b0c21de55
++C Merge\sthe\slatest\sfixes\sand\senhancements\sfrom\strunk.
++D 2016-01-14T14:48:17.709
++F Makefile.in c61147c9afcc7a058a3a88876a5b9344fce55353
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 6862a51bfd3716bbe3c387c724feb73937b107d2
 -F Makefile.msc 1dc36cfd3c047c9685e539257e158485f16ef035
++F Makefile.msc d35026ada75f21433cd34be90dc3865972cea6df
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -318,7 -303,7 +323,7 @@@ F src/insert.c a2302c96652242b2d871445c
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c bb8aaa94c50e0c66e32dd158bcbf425ccf071864
 -F src/main.c 6d589f27980c4aec014ae9a081d611e7e5ebc115
++F src/main.c a88a45514be79e5f48b5cf4a147956f267425fa7
  F src/malloc.c 8f787669e79de26efc42272b5797bc00fff527c6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -353,12 -338,12 +358,12 @@@ F src/printf.c af589a27b7d40f6f4f704e9e
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c d84c091185bc160c349e8bf460ebd084dbd77e64
- F src/shell.c 40ded7e3ade5f2cc89ab1180994f6a6975ebc6f3
- F src/sqlite.h.in 686be87fcbaea46b1aa8197a17b7a437d39764fc
+ F src/select.c 5b0f2aa9f73ec7b65d1711d485471854d5bad23c
 -F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 -F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
++F src/shell.c 01e109c27300379b1c35b254cd294cde635f0179
++F src/sqlite.h.in bb645ccc4090a6e95e7b5d92818f46e41033d076
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 -F src/sqliteInt.h b8ccd34a919e4b6bab8c4164046330002aa9a27a
 +F src/sqliteInt.h 09f70fe715a74ea0048ae05526f2a1b6e3a3b6a2
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -418,21 -403,21 +423,21 @@@ F src/update.c d8d675aa299336ac086ad203
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c a479a4bd02b6b77b7ff3ff84825fccc0b967fe6a
 -F src/vdbe.c 6572d00eefeaa0b14b325fdf3a409920ec3fee82
 -F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c f2e6b4fae037db04323be8de7bcd266375746471
 -F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
 -F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
++F src/vdbe.c 9b4da74dbc1554045c69dacbbceb373272d2e0be
 +F src/vdbe.h bfe3f80dba435377cdb64fd917f2529f0f48ab77
 +F src/vdbeInt.h 1bff4effc71888e3f304e2e6ac7484e39ab78c28
 +F src/vdbeapi.c ab2cb8fe23fb9f3195f1311eaa800495d83b6118
- F src/vdbeaux.c 77b4a5cbde74f7c3b1d7052c5c4afea89fb20341
++F src/vdbeaux.c 30f329b90af08d92739185788c6fbfd1c233b8b4
 +F src/vdbeblob.c cc13eca96b8ec51b6248de785a1aec5df11f5805
 +F src/vdbemem.c 25b6cfd665b5073480452426e84136edd94140c0
- F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
+ F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
- F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 92ca9e7923c337c497e4c9aa7edac800e269a1d8
- F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
- F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
+ F src/vxworks.h 974e7d9a98f602d6310d563e1dc4e08f9fc48e47
+ F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
+ F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
+ F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
+ F src/where.c bb69654f841ae7af0a20cc6fb8f0ac57901c31be
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
  F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
@@@ -1417,10 -1401,10 +1422,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/sqldiff.c 653db1a9294e0b34849c4504599c282a18d8b8c6
+ F tool/sqldiff.c 5a26205111e6fa856d9b1535b1637744dcdb930b
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.tcl 96022f35ada2194f6f8ccf6fd95809e90ed277c4
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
@@@ -1428,7 -1412,7 +1433,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fa4705c91f9650ecd7ec967dbbf0028aabd8a98c 8e807bfaa197027d0cb73532baa96755ce71ea12
- R 207c595909cfacc40e672adb0642fe8a
 -P f791fc7009d68941c60d7bf953bab19d86112133
 -R 52083946c40dd4f44744cbc0b447540f
++P c4a858b228a164be2f89f5b01833f0b5e0d7735b 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
++R 99385ae0fdf1facdff7c072dfc1f2a57
  U drh
- Z c05d49256eed75a98851d063f39abe2d
 -Z 9b36451b3b0b6d81cfd6f7c438e3b3aa
++Z c131c7ae38d871cc572c248d8ac0f193

diff --cc manifest.uuid
index 252d7d9b65f5582ce11f9be217cee454ecc8af59,92616336dff511057125335ec56ea458a299bffa..448e42f7f4c4add01571da8f9f56eddcff25f5f8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c4a858b228a164be2f89f5b01833f0b5e0d7735b
 -8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
++007e5c6df60f9743ac6914332f59925e4a7a861c

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge