Merge recent fixes and enhancements from trunk.

FossilOrigin-Name: f073401792c0a093d4324fc2636170f108656976

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f21612e1366f3c1626af6d338eb84b2aace4198a,69b6e1ba9ff3d54c67f04829d44e5a36e924fe99..7ae907a4faf5d03f5228e780d2bc44586b809ea5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sOOM\shandling\soptimizations\sand\sPRAGMA\ssynchronous=EXTRA\sas\swell\sas\nother\senhancements\sfrom\strunk.
- D 2016-02-05T14:29:18.094
- F Makefile.in aa753ba4969643ec65009ff2e55beb95dd38ace4
 -C Make\ssure\severy\sco-routines\shas\sits\sown\sset\sof\stemporary\sregisters\sand\sdoes\nnot\sshare\stemporaries,\ssince\sa\sco-routine\smight\sexpect\sthe\scontent\sof\sa\ntemporary\sregister\sto\sbe\spreserved\sacross\san\sOP_Yield.\nProposed\sfix\sfor\sticket\s[d06a25c84454a].
 -D 2016-02-09T02:12:20.490
 -F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
++C Merge\srecent\sfixes\sand\senhancements\sfrom\strunk.
++D 2016-02-09T15:50:33.582
++F Makefile.in 435011bc2d0ac33408de21bce5338e76673cd8f0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
+ F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -275,7 -272,7 +275,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk cbcf106c029aabca5b1e5373237d0b731f60abef
 -F main.mk 37497b06d3e3acb2c71675d76627a3b2639c6db0
++F main.mk 574d6e597978ef0f04192ad77a7a98b4a9834e31
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -294,10 -291,10 +294,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c b5c39d04a4c1650df7a7b14bc31a6139e8fcfb57
 -F src/btree.c 4c8caaeed7878aafdb607c3d2bcbc365bb0d19a1
++F src/btree.c c9123aa7c76b44ca14ee9ec9c0aeef1f3f8b058d
  F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 198eaa849c193f28b802ed135b2483c68ef7a35c
+ F src/build.c 54866fbafa09d494269bdefc79995eb7207003a6
  F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -312,12 -309,12 +312,12 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b84359365bace233919db550a15f131923190efc
+ F src/insert.c 046199e085e69e05af7bef197d53c5b4b402b6fa
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
 +F src/legacy.c c6552d90c1422aeae86fe0191c6963946aa2fddf
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c 83d9667de302d71a56905122d6c5c07cb3ec69e8
- F src/malloc.c 55ebb1701ebd39985dbcc497aaecb09192b69682
 -F src/main.c b67a45397b93b7ba8fbd6bfcb03423d245baed05
++F src/main.c fb6058f37c1c4a8a3ee1c34a46cff59e583766de
+ F src/malloc.c 337e9808b5231855fe28857950f4f60ae42c417f
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -351,13 -348,12 +351,13 @@@ F src/printf.c 63e6fb12bbe702dd664dc370
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 57646a44ba9a0bc4aa926ae9c79b8199c246844b
+ F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d
  F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 -F src/sqlite.h.in cf22ad1d52dca2c9862d63833e581028119aab7e
 +F src/sqlite.h.in 780a7899e1ddd11839495d7cf6d5def6f549800c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 -F src/sqliteInt.h 3aeaff9611acd790c8e76719b33db09ab885d537
 +F src/sqliteInt.h ab8b7a5e7d007e0d5ba254b9c304ba9d21da3ff7
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -376,7 -372,7 +376,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c f569bb9c62cb98ffc7968d7f557703197fb4027e
 -F src/test_config.c 7985332c806d1cece793475c75a6abcccde9d331
++F src/test_config.c 9f96e204b38ef8b1fbbe29565f731f4bf1811152
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c a61f54247fdb843761d709879c3bcd1989b2050c
@@@ -417,11 -413,11 +417,11 @@@ F src/update.c 310ca7adb86a7d1f2afae469
  F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
  F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c c193299e595a13eba247738e22fce25c49346a6c
 +F src/vdbe.c d76cf7d7dbb51d8b009414cc4b2f2d2da228e572
- F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
+ F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
  F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
 -F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
 +F src/vdbeapi.c acc259f1b473cfeaf0459c482156579067bc3859
- F src/vdbeaux.c 49b536284c2b8a823dd342d653e18145ca2b393a
+ F src/vdbeaux.c deae5d3bd45da0e57c7d9e1d7436333d142dc3bb
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c 68fcfac37dc6601d98c32cc5adee4d39f2c1b7b4
  F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
@@@ -516,8 -512,8 +516,8 @@@ F test/btree01.test e08b3613540145b353f
  F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
- F test/cacheflush.test a755c93482ce2e20c04825304bef27e7b7ea0111
+ F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
  F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
@@@ -794,9 -790,9 +794,9 @@@ F test/incrblob3.test 5fa6f2665ae37da05
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
  F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
- F test/incrcorrupt.test 9786cba68c5832f01887fde1c06b43c3904d86f6
+ F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 -F test/incrvacuum2.test 676c41428765d58f1da7dbe659ef27726d3d30ac
 +F test/incrvacuum2.test a1828b6165af6c248c4eb80aeaee2bcbb45768c1
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test fe3c7a1aad82af92623747e9c3f3aa94ccd51238
@@@ -881,14 -876,14 +881,14 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test da01dcdd316767b8356741f8d33a23a06a23def5
- F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
+ F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
+ F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test d2b2d6ca37890b26703a2258df8fd66f9869da02
 +F test/memsubsys1.test 6e741378471c2e3a615782fd8923d99ac3a2c002
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -935,8 -930,8 +935,8 @@@ F test/orderby7.test 3d1383d52ade5b9eb3
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
- F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
+ F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -950,8 -945,8 +950,8 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 382a43c49f49bafe6fddffe904ea33d6bb3ff33e
 -F test/pragma.test 507ac7ef2ea5682241ea0ef041799ca70bb5e0bf
 +F test/pragma.test 70826dc1f03bc0b051d4c907d4572c704d38dc58
- F test/pragma2.test a9400a7289605280576098b97f5cde3f204075c0
+ F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -972,9 -967,9 +972,9 @@@ F test/reindex.test 44edd3966b474468b82
  F test/releasetest.tcl 975449bf742b8bb9025208292208af816a1fcb58
  F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
- F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
- F test/rollbackfault.test 6a004f71087cc399296cffbb5429ea6da655ae65
+ F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
+ F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
  F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
@@@ -1011,9 -1006,9 +1011,9 @@@ F test/selectE.test a8730ca330fcf40ace1
  F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
  F test/selectG.test e8600e379589e85e9fefd2fe4d44a4cdd63f6982
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 -F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 +F test/shared.test 13376ba3be1c5685ab1ec184189adabd15fa70be
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
- F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
+ F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
  F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
  F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
@@@ -1061,10 -1056,10 +1061,10 @@@ F test/spellfix2.test dfc8f519a3fc204cb
  F test/spellfix3.test f7bf7b3482971473d32b6b00f6944c5c066cff97
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
- F test/sqllog.test a8faa2df39610a037dd372ed872d124260d32953
+ F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
 -F test/stat.test acc91e80517fff447ae8adcfd953cfdaa5efc0af
 +F test/stat.test b091791ccaa62ce49a3e7886cab1a69fa9be17a8
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1300,36 -1295,36 +1300,36 @@@ F test/vtabH.test 5f5157a1501d9889ec35c
  F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
- F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
+ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 0148c8b3421a25fdb4d9c160e84a681d0646371b
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 21c1bc3ca769350746cbaf0ba02119bc61e9c4ec
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test 57b138012b14307e7d6298092db7f3632d360653
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
- F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
++F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +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/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
- F test/waloverwrite.test a0d2ae0783187374c1e6a9571e0916152977cb81
+ F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 059cb75484a1ecf6357a2c1b3324b8156749221e
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1431,7 -1427,7 +1432,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 e6a4a16312bf71ed5f277cdcd326003eb2580e72 b082538da774ac77f284fd7e22f9b1b9c2abc343
- R f00791f129fbb0e3354751dcd2ccfa8a
 -P 6eab74c9ae57676044b5bc82fa14e92fd2448008
 -R 28a5285fd29b59b5a769fa2b98c8137d
++P 201fcbeef35d3d06d71ef5770fb72152840fcc2e ca72be8618e5d466d6f35819ca8bbd2b84269959
++R fd70a57c2a0d3952fc53cce53256cdc7
  U drh
- Z 369def5011931d9ec10abd9e79be7ab9
 -Z 50a93197f1857fe46bad3c49957d1f43
++Z 0c6e5d4af8d5d65dcbc7bc2a9e46ad9d

diff --cc manifest.uuid
index 76132aa5b337a98b3739cf378e1b1ad351ea2bf8,9e7ed6ea0867335bed60efdec1b95d62d1fbbde9..8c29dd7e22a0fcd7b84b2f92403d05e62fab2504
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 201fcbeef35d3d06d71ef5770fb72152840fcc2e
 -ca72be8618e5d466d6f35819ca8bbd2b84269959
++f073401792c0a093d4324fc2636170f108656976

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc test/wal6.test
Simple merge