Bring in all the latest enhancements from trunk.

FossilOrigin-Name: 031feebc94b0cfe1b0ae96ede1684fe54cd79c1d340b8b35cca1ef885f82dde4

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 8496811264e4340a18ce405c7f3e00f717c54c44,3f0843de7d287dc85304eeca9b53003f1f0cc2b1..d4dd5c5548c9a0c7e35b290cbf0079d51897a7f5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\schanges\sfrom\strunk.
- D 2017-04-08T18:24:57.413
 -C When\sbuilding\san\sephemeral\stable\sof\sintegers,\sdo\snot\sassume\sthat\sthe\stable\ndoes\snot\salready\scontain\sN\sif\sthe\sinsert\scursor\spoints\sto\sN-1.\sFix\sfor\sticket\n[61fe9745].
 -D 2017-04-24T14:16:55.419
 -F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
++C Bring\sin\sall\sthe\slatest\senhancements\sfrom\strunk.
++D 2017-04-24T16:14:58.795
 +F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc fed3d46b77ac93f76f85ce6d285ea7640de205d165c77b95e331e02d834e1296
 -F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
++F Makefile.msc b271d982da9b4eb842740f90a6a0414bf756bb11880b8bcaf0602a1ddaca5c02
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
  F VERSION 0a0e02e16b44ea735b40118fc844311b2ab0d35b25fbeda5120aee62f973f663
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -347,8 -345,8 +348,8 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 1b654f06bcf5d8502f4a6f05e30e1bdc9f7c7d316ce58429db466865827351ab
- F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
 -F src/btree.c a0d9a1c782ff3d22df5d217a4fa7125dd69ad5849caa51c4442c10246ca8ae27
++F src/btree.c 71c947c2a405dff10518555e3beed277f3d28c5a962cc21db1e537afe62201f0
+ F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
  F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
  F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
@@@ -388,29 -386,28 +389,29 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
 +F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 85b19486054c8cd5c4117dea882d983ea065d16e
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 +F src/pager.c 8a4a3066cf9b06191b852dc0bdcb70a06de9c472
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
- F src/parse.y 48b03113704ee8bd78ee6996d81de7fbee22e105
+ F src/parse.y 0513387ce02fea97897d8caef82d45f347818593f24f1bdc48e0c530a8af122d
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c 2362670a9d28b71708aecb2b9b10b3f7be71f4c950961c07e81dc400e3ce6371
 +F src/pcache1.c 4d201a7ee865e9a0ddc214db4c997e44215fefa15c1b0ec53cee40e9ba7a9716
- F src/pragma.c 28f232da1c31db79cbfe4818650c5fd293083a99af8f9f3eafcef254ce97613b
++F src/pragma.c 994ebf405c74f44b11ab0ad7113e4d8f26197e3961b5f70aaf7a8c00d4259874
  F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c afcf31d8ed7c890328a31d3f350467ccd273af345b24562382b398d6d9cd0664
- F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
- F src/sqlite.h.in 7e99920e98319e8360cc260eef3da768799a18f4aecf6e0ef9a37a58fcc8f5b4
+ F src/select.c bf8ab605e49717c222136380453cfb7eda564f8e500d5ff6a01341ea59fefe80
+ F src/shell.c 21b79c0e1b93f8e35fd7b4087d6ba438326c3d7e285d0dd51dfd741475f858a1
 -F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
++F src/sqlite.h.in f674be97f72f99f9b56fc82c9b690be26d74d4b11fb7282235c642cb1d5d44dc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 46dc79e5afefa1fc26826e7aa01fe2d71c7e001f220743374af048e5e5588ba0
 -F src/sqliteInt.h 9affb53bb405dcea1d86e85198ebaf6232a684cc2b2af6b3c181869f1c8f3e93
++F src/sqliteInt.h e053650a2231d0f19c0174dfb6d4f901901c53a76540a8370770eb7d9fa15850
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -430,8 -427,8 +431,8 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c edcba290248dc18736dd814c9b95863c6762e0b35753048d8cbe5bf65f7abfbb
 +F src/test_config.c 075bd5db1e2a605bd7838d66512ac06d0184a2953457b50626cb6655f367cc03
- F src/test_delete.c af7eab5702f853fb1c62a5f7665e2234cf1ae17b
+ F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -472,25 -469,25 +473,25 @@@ F src/update.c c443935c652af9365e033f75
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
- F src/vdbe.c 94a909c5e4707ed7970678932fb4f45f1d2f2f69fe44a090abed94b363a8f438
- F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
- F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
 -F src/vdbe.c 1eba07ffa0e4ff5e14ceca17e366c26f58c11d12cc56e55a9a13157a93533b7e
++F src/vdbe.c b96842a835785f6d5c0f1680a749e18695e28dc892f3a3c7086966f9c85378a7
+ F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
+ F src/vdbeInt.h c070bc5c8b913bda0ceaa995cd4d939ded5e4fc96cf7c3c1c602d41b871f8ade
 -F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
 +F src/vdbeapi.c 995f635640bdbc38d95f24c467b87e79646b4ce4
- F src/vdbeaux.c 0ecacf8c7ca93e430b30819b8fc9b2c1ffe88202d1437e88c08a1f0b6159c58c
+ F src/vdbeaux.c 6b3f6ce909e206d4c918988b13b7fa687e92b4471d137e0f2a37edac80ec60be
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 8bb4dd22837da969bfda25ef3f92d41aaad192328f89a0951290d5e26ad7dbc4
+ F src/vdbemem.c 2c70f8f5de6c71fb99a22c5b83be9fab5c47cdd8e279fa44a8c00cfed06d7e89
  F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
+ F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c 49b48b720184fdde747c468d7270feeb1b88c6a71092cea3a1aa168dc8ac0b0f
- F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
- F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
- F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
+ F src/where.c c6352f15be5031907c68bcbde96cad1a6da20e9f4051d10168a59235de9a8566
+ F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
+ F src/wherecode.c 943e32e9dccd0af802e0683ae11071c8bd808364e5908a5fb66758bd404c8681
+ F src/whereexpr.c e913aaa7b73ffcce66abcea5f197e2c538d48b5df78d0b7bba8ff4d73cc2e745
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -860,10 -860,10 +864,10 @@@ F test/in.test 20c5529986998949908f889c
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
- F test/in5.test 6c006e0bcd7351b69350ef566e65f244023489e9
+ F test/in5.test 7ae37fcd4a5e198291c6ab5f31a5bb3d15397efe8b75a6736d7a95a7b8dd9e08
  F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
  F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test 21a52a6843a56cdcce968c6a86b72a7066d0e6ba
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
@@@ -1029,14 -1029,14 +1034,14 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test af720e7d139e7e5417341d0f0eef2b911c0b067852138dc2f5b6a451b5725118
+ F test/permutations.test 8aaa22a0f428a7e6b8446b97bc7691a273eaeff5dc290fb9129bf79fa9813a6e
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
 -F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
 +F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 9e6db85f81c63f2367c34a9d7db384088bd374ad
@@@ -1575,7 -1575,7 +1580,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P dd16439ea12b0384abcb0cab3768a5933dabb0cf77706c6ec9797209794b04ab 204e72f0080e8f08f99978870bd3cb9d59b068ecffee82192d707c650548b43b
- R a08696cbb457a66829e57685e6c1a4d0
 -P e39769f442ea86273f8fb7bd2f249b7d760b2fe4bf9ec191ff91def8231f3f35
 -R e0d07d9fe79e0700cdeeda8796e623bf
 -U dan
 -Z 6adee9578f00e93307a285e5276adbb5
++P c23ef5e231908450da7461233bc3f4a38ab11ff351ae0c34d91e82c61ad13b3c 1c1b0862236f564283be08338790d6494e705f1198547a59499e3f8c07f2cd99
++R 6df423644feaa9ee6d9cacb610f5e92a
 +U drh
- Z 6a47619c0e0342502c183719fabb9040
++Z 228aba7f6f5d3aef5936c60cef2abe69

diff --cc manifest.uuid
index 210888256bc16188a65e26cce5321dd51dfe5d34,cd44d34c9a854e639f6e09e28a93a40980180d29..e8d7fd32e92adf3e22692a3ffb666300abcd7902
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c23ef5e231908450da7461233bc3f4a38ab11ff351ae0c34d91e82c61ad13b3c
 -1c1b0862236f564283be08338790d6494e705f1198547a59499e3f8c07f2cd99
++031feebc94b0cfe1b0ae96ede1684fe54cd79c1d340b8b35cca1ef885f82dde4

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge