Merge all recent trunk enhancements.

FossilOrigin-Name: 5b700f313d753a308d2c6b5e5a5ee42af2e6d180

diff --cc manifest
index e723acf5c55d33432e5a1bb901c5cbc95d131e38,b08341888c3fa93f92261942a1090fe1d679ad4b..ae3e8f753bf1e8787beb9f9714593d4538edf803
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\strunk\senhancements,\sand\sin\sparticular\sthe\ssnapshot\sinterface.
- D 2015-12-11T12:53:26.994
 -C Fix\san\sassert()\sthat\smight\sbe\sfalse\sfor\sa\scorrupt\sdatabase.
 -D 2016-01-01T03:37:44.301
 -F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
++C Merge\sall\srecent\strunk\senhancements.
++D 2016-01-01T13:31:36.005
 +F Makefile.in 2b14d1b2c0d8b4c6fd84536d3d7860e1ddc03efc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
+ F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -285,10 -276,10 +279,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 1b90ae050612380659db1ebce870fccee738e845
 -F src/btree.c 4d3452b2a3daf875490ac4f0a278da7f85fabe12
++F src/btree.c c24afbe7c9e4a3e8279d91680d9e9602588db488
  F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
- F src/btreeInt.h 3ab435ed27adea54d040584b0bcc488ee7db1e38
- F src/build.c e83da4d004a4e050c01acbb821ff7a7b1019c29b
+ F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
+ F src/build.c 1c9fb552148ee8f9234435a38833f8fca2081a71
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -303,11 -294,11 +297,11 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c e1d20ae8979e25519c2670233718676bedcfedc9
+ F src/insert.c 6b45cc86967da11aa024d034745f93f66d53f650
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c 3b6c60fd72b862fe941af074811f54bcdffe109e
 -F src/main.c b9641a4f650230bfc5dbb0bebf7b33ff4d27586a
++F src/main.c 54f3a646cdcffc5cb03b4ce2ca6da77ff75da39f
  F src/malloc.c 8f787669e79de26efc42272b5797bc00fff527c6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -319,10 -310,10 +313,10 @@@ F src/msvc.h d9ba56c6851227ab44b3f228a3
  F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
- F src/mutex_unix.c fc54f25b2a750d53b32512a4a728cec28039ae2a
+ F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 +F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
@@@ -334,21 -325,20 +328,21 @@@ F src/pager.h a038f5d7d5b17a8463e312d45
  F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
- F src/pcache1.c 46a110be31a8d9f9b41431733836822ca0dd27ab
+ F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
 -F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
 +F src/pragma.c c1ab37e1576d22715d3bae4f51658326240a8161
- F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
+ F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
- F src/shell.c abbc74ea43dbf2f306ea18282d666683fb5efab2
+ F src/shell.c 8d152e833c3b79825978deb83175234749c5cdf3
 -F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
 +F src/sqlite.h.in 52db0e5240e6c3d355937cdc187b61999d884aff
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 8cde64521e8a71ee56b2adf018fa4119d0ceae1c
 -F src/sqliteInt.h 92f83ab4612141f95cdd663ea55fa4528f3f8c2a
++F src/sqliteInt.h 35e07d7cff4693ebaa5c43d2365ea1f1bc68e5c4
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -405,28 -395,28 +399,28 @@@ F src/tokenize.c 5606871a377f390af7040e
  F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
  F src/trigger.c de3ed31ad3218a20d7d7e18bf1b3b734e78bda66
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
- F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
+ F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 5cd1221f8a9ee01574124986ac2d0ec97504ea50
 -F src/vdbe.c 39d7628bb8eed10a5378adcf97cca6dce7829a8f
++F src/vdbe.c a01c8ccdb4a90aaabfc126c2debf5cc9f420d0c9
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c ca523180c128dc6c64894efc61eb14374117c864
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c 192fba4a5adea9a2f1160ad172a86a354bd135ce
++F src/vdbeaux.c 41d3493139900b3f74d570f6406c7d1888202d35
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 360acd6c7c35550f59ee2db3c92cbe6712d5f0b6
 -F src/wal.c 974928c988681c5157202c79dd9f26afaa7b5086
 -F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
++F src/wal.c b08004315d7f475d44e7e09174897cc016cfdd14
 +F src/wal.h 074df251e14dffb0ea9ce958a4328dff1a68c9d7
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c b18edbb9e5afabb77f4f27550c471c5c824e0fe7
- F src/whereInt.h e20801d89e34de1912bb6a3babb30c390da27add
+ F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
+ F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
  F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -573,9 -563,9 +567,9 @@@ F test/createtab.test b5de160630b209c4b
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
  F test/cursorhint.test 432811b62bd5ffb812729f49bba3b9ad687550bb
- F test/date.test 42973251b9429f2c41b77eb98a7b0b0ba2d3b2c0
+ F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 -F test/dbstatus2.test 10418e62b3db5dca070f0c3eef3ea13946f339c2
 +F test/dbstatus2.test fc968d3005b4d827eba807a06573a6c528aa119a
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1377,10 -1368,10 +1373,10 @@@ F tool/mkkeywordhash.c 06ec0b78bd4fa68c
  F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
  F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl e94e55d247d4fe3be34f2a4f4edb03fdcd09ce5b
+ F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
  F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
@@@ -1415,7 -1406,7 +1411,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 e1fb33c7d2bfd8ea115e667d7671a7529cd116aa 9b124a5a310aec0145495c9980bc0c1308fcca02
- R c83274922244e0ad0a3abe3112b65b7b
 -P 6e30f8c6c3af9b0df39783888a1479f88271f989
 -R 6e164f424e8aa8f067cc3a49970e615a
++P 7e7b24064510001ca4a0c8295fa7d0138bde8dae 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
++R 301360c61d3e627f628a10e0fd167e91
  U drh
- Z d11cb9f98a9186557910b93b1d6aca34
 -Z 284865b0f74f185e26863aa2df0b68aa
++Z a5d1b5d07c798b4bf7e432435ffb7ccc

diff --cc manifest.uuid
index 54490d40e0fcaeba34b41abde755deb19babaf70,7d85a2b67d93c02042beda2612acd8534606ea5a..88c9302ee6928f33658779f0749e4f5ef78fdfc7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7e7b24064510001ca4a0c8295fa7d0138bde8dae
 -68360cd2211b7ab25dd4ca55a2e82e31f51f2976
++5b700f313d753a308d2c6b5e5a5ee42af2e6d180

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
index 5b6ca41a3159b531e9dd56e6384e40d3f947af9e,10353e839f70f138bebd64e22e90ae3dc47c9b3d..3fdcfd5008c2a87207bdb31dcf3f45fb2439500a
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -1859,13 -1859,9 +1859,11 @@@ void sqlite3VdbeMakeReady
      nMem = 10;
    }
    memset(zCsr, 0, nFree);
-   nFree -= (zCsr - (u8*)0)&7;
-   zCsr += (zCsr - (u8*)0)&7;
-   assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
+   assert( EIGHT_BYTE_ALIGNMENT(&zCsr[nFree]) );
    p->expired = 0;
  
 +  p->expired = 0;
 +  
    /* Memory for registers, parameters, cursor, etc, is allocated in two
    ** passes.  On the first pass, we try to reuse unused space at the 
    ** end of the opcode array.  If we are unable to satisfy all memory

diff --cc src/wal.c
Simple merge