Merge trunk enhancements into the apple-osx branch.

FossilOrigin-Name: f12b8a0f7958260cb8e6b9be1aaa583cf383b39c

diff --cc main.mk
Simple merge

diff --cc manifest
index f5f295d0e18d424b705fd6f0be7873f461d0e8bf,e3335b827fbb3b8775f5ab3cdeaf1f2f49ba0eb8..747ed30695936f82dc56e8d2698e5da4c90ce676
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2015-09-03T14:31:00.477
 -C Add\stest\scases\sto\scover\sfts5\sintegrity-check\scode.
 -D 2015-09-15T14:39:17.597
++C Merge\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-09-15T17:20:41.231
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 +F Makefile.in 3d5c779460045b6fcc3179f46c27c4ab8716a189
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -261,7 -261,7 +264,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 9870f0c839bf9e97f3a8578ae5868b9026221754
 -F main.mk 58eb74de702467c3b71cdf06f213cefe7f5ce544
++F main.mk dd4f04d634c006db1eacb93507336fe158f1da79
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -282,10 -282,10 +285,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 0ac85a1584ae17f0a13f4748a5c4f652fe0f4c66
- F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 -F src/btree.c d31008cfbf83e3ae5cb96bae3a00f4b57f244a16
++F src/btree.c 1fd5b28b3922ec5df5eee544f54e20fb75bbe099
+ F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 6c3a8a9b21402a6be98126f7d86b76527e68ca67
+ F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -300,13 -300,13 +303,13 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c bcff4a416177ed90faa8dba65f0266ddad2aeb76
+ F src/insert.c 9748a37e058256eb2ead69f028ab85ebf203ad15
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
- F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
- F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
+ F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
+ F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54
 +F src/main.c d3fd6de724a28d6f3256a675c1234a685f5e4355
- F src/malloc.c 021012e28a81ffdabf4c30ec3df6ce1f6cc93f1d
+ F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -314,39 -314,38 +317,39 @@@ F src/mem3.c 61c9d47b792908c532ca3a62b9
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
  F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495
- F src/mutex.c 529e95739f815300a33c73fd8a7d6bdf0c24bd18
+ F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
- F src/mutex_unix.c b0d280089df0f49545f1318f45d61d07d2f674a8
- F src/mutex_w32.c b601f9e3073f7bd2c1f42a8c0ce59e42d6a08f85
+ F src/mutex_unix.c 8cfa6e83c618d2fcae0fe63f4d2b5bb16b11a97a
+ F src/mutex_w32.c 2e025e6642eaf27597403690980f560d1a91f62c
  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
 -F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55
 -F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
 +F src/os_unix.c 61841d3b4fee28918fb4206edafca7e0183f068b
 +F src/os_win.c 8a586f1f7e829e361a41a45fd6cf6a7cc44e7314
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 4e202d93e77cfc8f316a99b5b8b0cd11bc65eb32
 -F src/pager.c 4784012f80b2197c61ff6eaf4f5c7026d93253fd
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
++F src/pager.c d4444e61dddd83f0ebf8488c1ec0118623d1b9b6
 +F src/pager.h c2471a089cd23dc7e0a9aebb8800ccfd693928a1
  F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
- F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
+ F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c b31af9dbc83b9c68e87d681b8453a9605f28e734
+ F src/pcache1.c a0c0bb29f7bd720743a16a95eb5dedba3ade15bc
 -F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
 +F src/pragma.c a6b01c318f5cc9723ee4df1b212bffbfc4697d3a
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
+ F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
- F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
- F src/sqlite.h.in 2dc1df9ca9e551aa54f3cd9ca65273e879cc832d
+ F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
 -F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
++F src/sqlite.h.in 2b58a85a29a93adbee2d2b79523ed05c975b42bd
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 680a0371a53bf46a2ad795e4ef3ccf2df702a1b8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
+ F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
++F src/sqliteInt.h c53f35e3c4622f5c560f078b0e0330faec2313e9
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -404,25 -403,25 +407,25 @@@ F src/update.c eb7ab3ff2928628692a4f14b
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 30e368a0eea028063fd257220dd3ede860b67412
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
++F src/vdbe.c cc4a5aeb2f3037134c70127a019086aa969f7401
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
- F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
- F src/vdbeapi.c 0a32d5892d78b4d9b58d4756575eac15bd585579
+ F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 -F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
++F src/vdbeapi.c 1e25aab83d2a0f4119e8e4c28cc640637430e11c
 +F src/vdbeaux.c f1f5d5acac493d77c8b4240a5bc5c8b6aa7c1227
- F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
+ F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c d973cff4571083ffb044c0bf4b69a27ca4b453b4
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 929c1d7e2da94dda41e5c2fa71a919fff91ad04b
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c f0e08e4f1f66ba1a0f5b70c5161cb031ce1fb858
- F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
- F src/wherecode.c c0d9b1c7c7c827998016809851d2ddc529de0fee
- F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
+ F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
+ F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
+ F src/wherecode.c 186b493599000e640203be0a441223b395dabd24
+ F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
 -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
@@@ -568,11 -567,12 +571,12 @@@ F test/cse.test 277350a26264495e86b1785
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
  F test/date.test 42973251b9429f2c41b77eb98a7b0b0ba2d3b2c0
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 -F test/dbstatus2.test 10418e62b3db5dca070f0c3eef3ea13946f339c2
 +F test/dbstatus2.test fc968d3005b4d827eba807a06573a6c528aa119a
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
- F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
+ F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
  F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
+ F test/delete4.test d9e7d553a939597b27d205b022d769469f361c1f
  F test/descidx1.test 6d03b44c8538fe0eb4924e19fba10cdd8f3c9240
  F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
  F test/descidx3.test 09ddbe3f5295f482d2f8b687cf6db8bad7acd9a2
@@@ -773,12 -773,12 +777,12 @@@ F test/incrblob_err.test af1f12ba60d220
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrcorrupt.test 9786cba68c5832f01887fde1c06b43c3904d86f6
  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 4d990005a67a36984e4f1a5f1bdccea8d08da4ee
- F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
- F test/index3.test b6ec456cf3b81d9a32123fe7e449bde434db338b
+ F test/index.test fe3c7a1aad82af92623747e9c3f3aa94ccd51238
+ F test/index2.test f835d5e13ca163bd78c4459ca15fd2e4ed487407
+ F test/index3.test fa3e49bbaa4f38091c9c742e36a1abe67c4ef1fc
  F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6
  F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7
  F test/index6.test 7102ec371414c42dfb1d5ca37eb4519aa9edc23a
@@@ -921,8 -922,8 +927,8 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test ac3b00c299250cc087d4a527b5c75a0f8aef4e54
- F test/pragma.test 69cc5c349f86bd06ca52f73c501ff1cee940126f
- F test/pragma2.test 8e72df3a16c0fda748ad52abf79cb8256b04a6fe
 -F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
++F test/pragma.test fc0c3c0ca53ad82b32c02db7000c1c6ba4449fce
+ F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -945,9 -946,9 +951,9 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
  F test/rollbackfault.test 6a004f71087cc399296cffbb5429ea6da655ae65
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
- F test/rowid.test 742b5741584a8a44fd83e856cc2896688401d645
+ F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
  F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
  F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
  F test/savepoint.test c671fdbd34cd3bfe1518a777526ada595180cf8d
@@@ -1036,7 -1037,8 +1042,8 @@@ F test/subquery.test d7268d193dd33d5505
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
 -F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2
+ F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 +F test/superlock.test 2b27b4ae7c6b9d534b0412e0d99f989aa1f3b9cf
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
@@@ -1264,37 -1266,37 +1271,37 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 2b5445e5da44780b9b44712f5a38523f7aeb0941
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test d7d2f20a26f0277b22f96cd631cd13d23e0545c9
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  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 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -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/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +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/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
- F test/where.test 1ff3d9f8da0a6c0dc5ccfd38d9225b2cdb5b6afb
+ F test/where.test 66d4c107e82dfe86c01a96277b77e7a8809aff0b
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
- F test/where4.test 68aa5ad796e33816db2078bc0f6de719c7a0e21f
+ F test/where4.test 44f506bf1737cf0fa4fc795e340208250f1fcd89
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
  F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
@@@ -1385,7 -1387,7 +1392,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 4af79477fd1c156bc31c397117a85ae72c286fe2 847387ec8e6fef283899578fb232b2c23b00ee5b
- R 2cdaeae584abbd4e78362222e21fe598
 -P eade355fafec558fc13dc4b08ca0b07713a2cd84
 -R 1694ed50f41ea37a05fbcbd009cf49d5
 -U dan
 -Z ab887f4a44598b0175c78de8cb058da9
++P d01658adf8680f3d128bb42ea8cc2f1acf46a569 1d018c35b9e81982df036f5e62a4a42219b54e02
++R 5d96cb7a2ad2fb6fd3a3e3a2b0864252
 +U drh
- Z cb48b4a44973267b87943ae4a67d3f2b
++Z c2f9ee1b623dafc86e7ced74f3b0b7ce

diff --cc manifest.uuid
index 0561ccf8af5eaa3d3292cdf1adcdb152b51c0e79,7bd70ebd90075dfd67309618a7cd84b1aaa607f6..fc4ef5f8d3b538f72be92691e15556396a617cec
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d01658adf8680f3d128bb42ea8cc2f1acf46a569
 -1d018c35b9e81982df036f5e62a4a42219b54e02
++f12b8a0f7958260cb8e6b9be1aaa583cf383b39c

diff --cc src/btree.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 src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge