Merge all recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 53b14a388838439087f92282bdaa3f706e9e197a7ed93f8c73e8844cffca8126

diff --cc manifest
index 5c6a41668a1348b8a15c02f95621ac89d79fe5e6,04e0a42467886bbd96e49449222de3500bf6b9dc..3c7b3d3f79b376ee33f470ad683f2e0c55c56ee2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\sauto_vacuum\sbug\sfix\sand\sall\sother\schanges\sfrom\sthe\s3.19.3\srelease.
- D 2017-06-08T14:41:05.866
 -C When\sgenerating\sindividual\sloops\sfor\seach\sORed\sterm\sof\san\sOR\sscan,\smove\sany\nconstant\sWHERE\sexpressions\soutside\sof\sthe\sloop,\sas\sis\sdone\sfor\stop-level\nloops.
 -D 2017-06-23T15:47:05.684
 -F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2017-06-23T21:05:45.803
 +F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
 +F Makefile.msc fb28c0304f8a14c5ce7d4bde9fea1c903f644b49e78ebd9976ab2a1f0eb8afb5
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
- F VERSION 6035ef7e627075d9a9194304c3a07acb2736a0abd0dd980a7ea75a3a45719e86
+ F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -267,13 -268,13 +268,13 @@@ F ext/rbu/rbufts.test 828cd689da825f0a7
  F ext/rbu/rbuprogress.test 1849d4e0e50616edf5ce75ce7db86622e656b5cf
  F ext/rbu/rburesume.test 8acb77f4a422ff55acfcfc9cc15a5cb210b1de83
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
- F ext/rbu/rbuvacuum.test 4a977447c15c2581ab668781d9ef4294382530e0
+ F ext/rbu/rbuvacuum.test ff357e9b556ca7ad4673da0ff7f244def919ff858e0f9f350d3e30fdd83a62a8
  F ext/rbu/rbuvacuum2.test 2074ab14fe66e1c7e7210c62562650dcd215bbaa
- F ext/rbu/sqlite3rbu.c 2a89efba9eeba8e6c89a498dc195e8efbdde2694
- F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
- F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
+ F ext/rbu/sqlite3rbu.c d1438580a451eebda3bfd42ef69b677512f00125285e0e4e789b6131a45f6dd8
+ F ext/rbu/sqlite3rbu.h fc25e1fcd99b5c6d32b1b5b1c73122632e873ac89bd0be9bf646db362b7ce02c
+ F ext/rbu/test_rbu.c ec18cfc69a104309df23c359e3c80306c9a6bdd1d2c53c8b70ae158e9832dcd6
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 8205d6e4466f766e57ce1b8aa38224ac9e1cec2d2bf4684cd1cc5a6ddf9b7014
 +F ext/rtree/rtree.c 00dabe6ca21e3dd58f1fade447c39b8a36da381b1f4bfccf966f7835b943b9ae
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test d5f0ba215b3bd1d05269ada86e74073b8445852aa0d33a63e10ec63a09c39473
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -318,12 -320,9 +320,12 @@@ F ext/session/sessiondiff.test ad13dd65
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
- F ext/session/sqlite3session.c 13642d9c754cc18f17e141f82860d269e2adf920
+ F ext/session/sqlite3session.c cc127222a9ea6f4eaa31281aa9da924f5244f6099be0ee526c950684fb3513a6
  F ext/session/sqlite3session.h d4db650adfcc7a4360e9f12a09c2d117b1db6b53
  F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
@@@ -349,29 -348,29 +351,29 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 4f095b81d7ee908a08cdffe0bdc8ca52c802f3bf739209bb4a50b48745d473f6
- F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
 -F src/btree.c 430e34151e6ef37e42d3f956bb062907c80ff91e1380704b967b8c1a02a98f64
++F src/btree.c 388fd95a653004e9c6a8370a8a5dd9620f0d861a2231bf46d8563236444d74d2
+ F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
  F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
- F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
+ F src/build.c 88a8cdc11d1c081ed565aa3e795bdf9160f4556463b4c4555e9860b59dd80340
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
+ F src/ctime.c ca1b2403003ef5d0e331ad2d73ee812ac33b8efc55f8e525ffa8ce5ac1f2c4ea
  F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
- F src/delete.c 665e705641e5815c3f32d05820d1a5aa630274e568af73f377fdbc614fcf40b4
- F src/expr.c 30f61b7d8236def0e99485651e5d983a102afa4cbc8b1ef0ab19ccb1f3841f99
+ F src/delete.c 3213547e97b676c6fa79948b7a9ede4801ea04a01a2043241deafedf132ecf5d
+ F src/expr.c 452c6f3aa656aabf3eefe96bb5f316b2c987fbc12c647964e4ed880f193ca31f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c db65492ae549c3b548c9ef1f279ce1684f1c473b116e1c56a90878cd5dcf968d
+ F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
  F src/func.c 9d52522cc8ae7f5cdadfe14594262f1618bc1f86083c4cd6da861b4cf5af6174
  F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344
  F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
+ F src/insert.c 974499a3999d339a4c1ba8ef129a988d9f136b3789e423808b38cdc19d28adbe
 -F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 +F src/legacy.c b143b1fe422524cb29cb5ac907c8a44684333d75
  F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
- F src/main.c cb5075a71935209f3834b6a4ba37c7bf16e65c565f270e1186c78b23e38f6190
 -F src/main.c 18f2145d572069dae91161add89446aec680aab296492a92ae5afcc2fc7c6b5a
++F src/main.c 5ea52d49432dabf9c472f549fcb6bb1b62ab54b1358218c3684ec1041a23382d
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -390,36 -389,35 +392,36 @@@ 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 1ca1c8157485d474695d8fc82af7a403c50370fa379b23e4f61ea1c17364e5ea
 -F src/pager.c 14f6982c470c05b8e85575c69e9c1712010602e20400f8670d8699e21283e0e4
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
++F src/pager.c 6140d3ccfba4ce89d5a9f113d32bd0554bd4ab8c476bf5cf6651f9060f6bfb1d
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
  F src/parse.y 0513387ce02fea97897d8caef82d45f347818593f24f1bdc48e0c530a8af122d
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
- F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
+ F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
 -F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c 2362670a9d28b71708aecb2b9b10b3f7be71f4c950961c07e81dc400e3ce6371
 +F src/pcache1.c 4d201a7ee865e9a0ddc214db4c997e44215fefa15c1b0ec53cee40e9ba7a9716
 +F src/pragma.c 994ebf405c74f44b11ab0ad7113e4d8f26197e3961b5f70aaf7a8c00d4259874
- F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
+ F src/pragma.h a8a949000214fefb6210330eed8ccbbb4f752619a9871f31b3dedd4a240277fd
 -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/resolve.c adf3ef9843135b1383321ad751f16f5a40c3f37925154555a3e61653d2a954e8
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c444ca057d48cf1a4eb8f6a58fbc13418a7f83ae94a6bd6f29f7ad6c704a9e4c
- F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
- F src/sqlite.h.in 74449ff8d024a8e1f6c4ab34b9dd71f781f8cc5ac548951af84efa1645995409
+ F src/select.c 35ccfae64cecfa843d54a5898c4ab7d6595ce03d147267fa5eecdc8eab39cd6a
+ F src/shell.c bcd3358ad6cb3f3dc7ec76ad3bd8191f123ed2425360c5c48fe431780eceb729
 -F src/sqlite.h.in 67fa8bd29808e7988e0ce36c8d4c6043eb1727f94522fc612687aa5af51931e6
++F src/sqlite.h.in 9ef801165ef597f8a57aa19a892206f4d6ad6854796c45de77fe402671573076
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h f6dd60bed454c84b87defdcfcf0f9c00a4c25dff60d7e41eb80d14a693809110
 -F src/sqliteInt.h 17e9bce594ea0c38c44ad0cbff4aa50cbff4b25f4bac9d38306caf9f1f028ac9
++F src/sqliteInt.h 6ce241ba8150b9300ae92d3b1145893efd35dffa55a931b5581e7b5602a6293f
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c c8cf60d0c5411d5e70e7c136470d29dbe760d250f55198b71682c67086524e4a
+ F src/tclsqlite.c 1ac29f18b1b3787a30b45dbbdf6fdc4aa4f1a2f8c7c8fe586beba1b177eba97d
 -F src/test1.c c99f0442918a7a5d5b68a95d6024c211989e6c782c15ced5a558994baaf76a5e
 +F src/test1.c f6b80b80cba7a56b0eec0339828dddc7383a471f1e3998b3b33eee315b39853b
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
- F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
+ F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c 004ad42f121f693b8cbe060d1a330678abc61620
@@@ -473,26 -471,26 +475,26 @@@ F src/trigger.c d1cae560bfacc8bfb3a072d
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
- F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
- F src/vdbe.c b10b07d8f26775bd42d5ea366ef8f6ee4809ffa1cbf1611c6c41a0cd3eb33aa4
- F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
- F src/vdbeInt.h 1ecdacc1322fdd3241ec30c32a480e328a6f864e532dc53fae8e0ab68121aebf
- F src/vdbeapi.c 70f5682b1558eb0f80eca553552c2869aded88d7c0d13843e63ba1a704a38781
- F src/vdbeaux.c 01dcf59b2a96bd3cc9db8c0d7f266518d113587459a2b3316279c4f9c90f28a9
+ F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 -F src/vdbe.c 6783778df820f3e0c68289fe5d12ddd34168b0eb1acf248668fec6e2ea1012d5
++F src/vdbe.c 992ca8b12473034027dfa0411e5266d257af58db470d6e84040dc62540f7d30d
+ F src/vdbe.h 70a409d171d4e51b962f0d53abf15c33c404c6aa4c9d62fb3a931b5a62ba9615
+ F src/vdbeInt.h cdcdabad4f5d6bf7a3beb826a7f33ee6f8f1cb220042bedd5b7d4bf2ea1d179f
 -F src/vdbeapi.c c961d8d9e0f52e2df60a6ddbbccd7d99dc4d00103db7e53f77fcef44fbd23178
++F src/vdbeapi.c aa587e3d860e8c4d9242fb7c57f0ba91967e939f734bb3979d71af6e5eca6d5c
+ F src/vdbeaux.c bc9b3228f6d99bef0d0ecaf3a0e0e8358b3873242d0d2fe944226de3fdf9521e
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 2c70f8f5de6c71fb99a22c5b83be9fab5c47cdd8e279fa44a8c00cfed06d7e89
- F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
+ F src/vdbemem.c 94b17d851f31d4fd075d47d373d4b33ed3962a6ecb82cf385018025751091360
+ F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  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 c6352f15be5031907c68bcbde96cad1a6da20e9f4051d10168a59235de9a8566
+ F src/walker.c d46044e7a5842560dfe7122d93ff5145dd4a96f4d0bf5ba5910a7731b8c01e79
+ F src/where.c d4f329d9055dbdb475d697f205db1104af886aad4400168fb9b957f6251ea926
  F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
- F src/wherecode.c 8ad48867660519e262a401720845dc76934f86f558ec9606335fafcd7a2554f8
+ F src/wherecode.c 339ee802d9d311acf0cba8b5a9a092e167ef71c3a777d4b3e57de25d193251c7
  F src/whereexpr.c a2fe3811d45af45a5c6667caabc15e01054fe6228c64e86e1f7d2ba5ef5284f9
 -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
@@@ -647,7 -645,7 +649,7 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
- F test/ctime.test a4effbe5472ef6c0308c4ebcba55c802aa297fff
 -F test/ctime.test 78749e6c9a5f0010d67985be80788f841e3cd2da18114e2ed6010399a7d807f3
++F test/ctime.test 9d4a932b6fd74df540492b17bedc570abf3e6f9622db33a36363f6fe580bd2b5
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
  F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
@@@ -697,10 -695,10 +699,10 @@@ F test/enc.test e54531cd6bf941ee6760be0
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
  F test/enc3.test 6807f7a7740a00361ca8d0ccd66bc60c8dc5f2b6
  F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
- F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
+ F test/eqp.test 3f9ba0b2594837c7beaa3ba824e2137cfe857308f020ec5a0c7a62b444e837b0
  F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 -F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
 +F test/exclusive.test ff85192dcf5000a1b53452a89fa9c5b61b0138cf
  F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
@@@ -1523,10 -1521,10 +1526,10 @@@ F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae5
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 32bb40741df11bddc8451de9ea4d130e7b4476d8064794b1cf402ac110840fba
+ F tool/mkpragmatab.tcl bdd4c76449e9e0874ae7f0846868c42583e63b47a081b177a97f94e2b702b3e7
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
- F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
 -F tool/mksqlite3c.tcl 226da6d794d7d43a31e159a6fa89db867bf1f5eafe4b37d031222287ef8dbadc
++F tool/mksqlite3c.tcl f02baa443e32175cde9b31ae1d1749b774a26e1e43391630ff5fe1b34c8c6c00
  F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553e1e237
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1585,7 -1583,7 +1588,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 12964240f1e497e6f02e4a87bf3eff75c807020108c3de83977264cc66188b8d 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
- R 3bf077ac2565718a31066a66ee1b255d
 -P 118f7bb33a6f78951bbffa957f48015d1bce5aaf9246a99262a90bc8ad52e5a3 e4a022be4b069b08cfdfda5295461676b99d28e17bbbedfbcb362dec69de59bd
 -R b4aae75660dcec44ff13144cfab52224
 -U dan
 -Z 2d5bd4652bc9ff6cf87670159c4dccb2
++P 93f32dd2dd572bd601215cc431318fd4da4bb897d8cf555d35d3b1ad60c4afe3 712267c9c08fdcef5d59cedc672657b55fd6a77472711711599f0bd653e6d880
++R 91c805a93f77196b0f661981b94ff101
 +U drh
- Z bfffc8e100f060437c630f2a98328854
++Z f468eb3ac1c566715f6a9c33122715f7

diff --cc manifest.uuid
index a1c0d78046f598781a4d38e3fcca20b8b971d2e2,9d93b6b581ea796dfe939ff9804a89f4dad3e19e..1bf18d4c62dac0771941b05a7b05d5d5faf632c5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 93f32dd2dd572bd601215cc431318fd4da4bb897d8cf555d35d3b1ad60c4afe3
 -712267c9c08fdcef5d59cedc672657b55fd6a77472711711599f0bd653e6d880
++53b14a388838439087f92282bdaa3f706e9e197a7ed93f8c73e8844cffca8126

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.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

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/ctime.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge