Merge 3.14 alpha changes from trunk.

FossilOrigin-Name: e98cefb17d03ca146d0ff42bdd4dd6a8f3ba6735

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 252fded560f7714018a8596f362113b60bcb4199,d28b4841cebb1c0ecaeb16da22b48778c17be2a7..b91fbcef9d7ff8457a3c3860ff9a5846326b4db0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\schanges\sfrom\strunk.
- D 2016-06-15T10:21:06.192
- F Makefile.in 0d33a6d04cdfd1c037647ad1790a3eebe35a883c
 -C Minor\stest\sinfrastructure\schanges\sto\sbetter\ssupport\sSEE\stesting.
 -D 2016-07-25T16:10:43.028
 -F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
++C Merge\s3.14\salpha\schanges\sfrom\strunk.
++D 2016-07-25T17:31:24.065
++F Makefile.in 7ac1f34182d307765c6439c899bd3dac2af587bf
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
+ F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -252,11 -253,11 +253,11 @@@ F ext/rbu/rbuprogress.test 2023a7df2c52
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
  F ext/rbu/rbuvacuum.test 4a977447c15c2581ab668781d9ef4294382530e0
  F ext/rbu/rbuvacuum2.test 45009e127c3fb385e5c0fd5a8a63fb922a79d0ab
- F ext/rbu/sqlite3rbu.c 3d35b1dc46f5ca0f0f59db8e6163fe7627ea107c
- F ext/rbu/sqlite3rbu.h 2acd0a6344a6079de15c8dc9d84d3df83a665930
- F ext/rbu/test_rbu.c 9bbdf6bd8efd58fbc4f192698df50569598fbb9e
+ F ext/rbu/sqlite3rbu.c 948677ee0ec57da51148e6c5f64ac68afcf36ab2
+ F ext/rbu/sqlite3rbu.h db8858120c9be14b60c9225f9da28221f5f6b945
+ F ext/rbu/test_rbu.c 9f043b74c46c45b231f4313aed1fccb379a76fe6
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c d26a815b0df1c412a6881dae8d7fd3c9c08cce68
 +F ext/rtree/rtree.c 45c6bec21cfe7579c5b81f2f236bd929b839694c
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -310,7 -308,7 +311,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 9fd80b4a8d315ce51bf25cfe729958312f1bf0dd
 -F main.mk e9d66f1b1c4874221d12d940be3ce5f397c10741
++F main.mk 6c503ea04b21085b03cd56de80412da2646ff1e5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -329,8 -327,8 +330,8 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 765b38f6127c43a8a1872f932d37b2478572ba60
- F src/btree.h 2107a2630e02c8cba58bb12ce14e731e734ea29c
 -F src/btree.c 6a42efa461cf3a0c33e8755e9d236371ac80d1b3
++F src/btree.c eb4d02a0795a36a8314cf79a735ae19cec19442e
+ F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
  F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
@@@ -345,12 -343,12 +346,12 @@@ F src/fkey.c bc4145347595b7770f9a598cff
  F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045
  F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
- F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
- F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
+ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
+ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c 4237fd37ca589f1d90b3ea925dd9df20da8e0c84
- F src/main.c cf5f2b15a5cb6cb7e6a0c727611fa857fbc59b24
+ F src/loadext.c 5dd8b5a67d32a98bb75657c2a9e48b2cedbf13a4
 -F src/main.c 16c1b2114eae8804caf3a8de8cb47bf2c6d83ad3
++F src/main.c 8473928b7bcd24d492ff16c701dd0d4bbd3db190
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -365,38 -363,37 +366,38 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c bb97ef31f4674b0bb57d13a981835db7dc1da677
 -F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
++F src/os.c c03b50496df5815e8f6d45bae4404b73cadf069b
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
- F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
+ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 -F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 +F src/os_unix.c defa2c6c6e01219459fa783d2f55841271c4eebc
- F src/os_win.c c5651f7c0eef2b267cad643197cbad77811e4108
- F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
++F src/os_win.c 8ba3403e276b0b01fd822bfcc162b83cacc80a1a
+ F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
 -F src/pager.h 031a87445e5e0afc85312d1c380e123ad6c7aeaf
 +F src/pager.c db9dccd139b20213507392831341ad64505c4106
- F src/pager.h 156c60a0575fbae0e3bf3c30ccc9542d5cc4cfad
- F src/parse.y 01b9f37c4c7009ab56fda98bc7db4c42643cecfe
++F src/pager.h 0bd89bacf4b410ef36d928f6f1f7ec0913f74702
+ F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
 -F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
 +F src/pcache1.c 9c2f433344e345da87f944c66e54b9e3e5d49693
 +F src/pragma.c 1564ee0bc96aed8b39cfec2c5bb655e031b6431c
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
- F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
- F src/sqlite.h.in 171a61d64618d49f70eeacc85234c874f7857945
+ F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
 -F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
++F src/sqlite.h.in 944ce442e0800b2ee6334d53a49be6aabfb7f74f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h 87671d1b47bbc1a97a7a55eb1bd66f8972795b3c
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h 49081ceab08eda9943d555aee57392c5b35d1c60
+ F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
++F src/sqliteInt.h 6e4e026581512bef8fbc4bb3ae11464813243cc7
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
- F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
+ F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 25fbbbb97f76dbfd113153fb63f52d7ecfac5dd0
- F src/test1.c 95dc5c2e299b721b250078e0382d9ab49219a144
+ F src/tclsqlite.c 5c213bf5fee084390f632df2328cf0821d483799
 -F src/test1.c 186e3b53c402b7a73bcb4ade2b77709675c39fe3
++F src/test1.c 5445032d4f1de27138802b26d8908fc3af028ba3
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c c75c8af0eadb335236c9e61b51044c58a8f7dd59
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -408,10 -405,10 +409,10 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
+ F src/test_bestindex.c f9e6807c52aa532e4775321ce3ed8e47c907ed45
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 7003f6f35134de6f19c6588f44783e43390ea277
 +F src/test_config.c 7711c82d42b9347540b6c8f628560055ff99b42a
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -451,26 -448,26 +452,26 @@@ F src/trigger.c e14840ee0c3e549e758ec9b
  F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
- F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c ed5269047a99b3c7d1210ce8b5a88a997d37f57e
- F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
- F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
- F src/vdbeapi.c ac62868e4d63d470e287fc9460a4d4fe5ff74fad
- F src/vdbeaux.c c90275b0e55a2b32c03dc09314194fe46f2429d8
+ F src/vacuum.c 544ec90a66a4b0460b7c1baeadbc21b45e6ca0b6
 -F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
++F src/vdbe.c 5260025793f47c1c51c04154f9762ef3ef310607
+ F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
+ F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 -F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
++F src/vdbeapi.c facd9075897e1878446e76680b0519cc6ba199f2
+ F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
  F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
  F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
- F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
+ F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
- F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
++F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 74f0798525b6306682d7234f230ea93f86959b9b
+ F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
  F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
- F src/wherecode.c ba71a4e4bada29aa9842200e6299714bf18c812c
- F src/whereexpr.c c32d47085dbaca0b8fd013210f56693c7d220d48
+ F src/wherecode.c 11e38f5e2dc5c007143fbf7fdb14bca40a6b74ad
+ F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
 -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
@@@ -618,12 -616,13 +620,13 @@@ F test/crashM.test d95f59046fa749b0d082
  F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
- F test/csv01.test 0929a9ce47021519512be92861f29e32d2538e5f
- F test/ctime.test 8b88c335b2018d4cc803b093e07e4a183d67ceec
+ F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
 -F test/ctime.test 0b995accd44a52914bd4744d5c1b6e1a56c7897c
++F test/ctime.test 4b4a66a12d0fd959fa295e56067bc21843583f88
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
+ F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255
  F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
- F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
+ F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 +F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1122,15 -1120,15 +1125,15 @@@ F test/tabfunc01.test 50a9fb379f9747fd0
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test cf0d0a3fd03d64892cec2d48aae9fb2f148680a5
+ F test/tclsqlite.test 1d73b9203b1ca8798d7d7310742b8d3febc0d56e
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
  F test/tempdb2.test 4fc92055f2a3f7626c0f2eabbb637dc021b311d5
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl a9f62aaa93c912483a5103ecaca109396fe5aa77
 -F test/tester.tcl 949b4a73bd0324b7c796818d0d6a6715712932b3
++F test/tester.tcl 92af6adf39ff36788a29e60c566488e555c1b7aa
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1348,39 -1348,39 +1353,39 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test 72286d113a40817702fa59285ee5b82effbfe754
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test 82bf6e493002b2d1580823b40e47bce3e15f468a
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test e322af729156c121183af4847c6e2b17bc629f47
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test bb234a1bb42248b3515d992b719708015c384278
 -F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
- F test/walcrash4.test 3374d6a0813bfe9d841a973958e0552b545a6423
+ F test/walcrash4.test e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 059cb75484a1ecf6357a2c1b3324b8156749221e
 -F test/walro.test 4ab7ac01b77c2f894235c699d59e3e3c7f15a160
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 310f5f364e64eaaa2f2233229a7b602ccb038bc9
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
- F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
+ F test/where3.test 54cdeb02157acc979de41530b804ae7b09552bf1
  F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -1506,7 -1507,7 +1512,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 815cc2bb48db713a0166b82a55ae931ac43783d1 0230ca17ba20ecd3d213788ad6891973d52a7b72
- R fd85b1aa025da2f637c342d358ad22e0
 -P 38a48cfb9a8212970c4a4f8458643c22ed067e8b
 -R abfe7130c6ed9b2d2a4c15502875beef
++P 0f707d1532d6c8277cf0f70821a83e0af621ce9b 8dcb9d506b5eef3a21d97877217e0df69966a915
++R 64dc8c8b61235f42fc56ab79725744e6
  U drh
- Z a8f3adf4cc6a98b1388974156651432f
 -Z 61654b6f48f562a527ce39380211aaf2
++Z 83a70419ff1cac2c3eaecd0fa6689f92

diff --cc manifest.uuid
index 79b8d2e9b3194fa1c64477d70e9e945c51c59de2,ccfb379c009c4d801786955659dbefb1d1dd14b0..0f62e731f5ccb3d119b74f5ee674b8f8d371eccc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0f707d1532d6c8277cf0f70821a83e0af621ce9b
 -8dcb9d506b5eef3a21d97877217e0df69966a915
++e98cefb17d03ca146d0ff42bdd4dd6a8f3ba6735

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.h
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wal.h
Simple merge

diff --cc test/ctime.test
Simple merge

diff --cc test/tester.tcl
Simple merge