Merge recent enhancements from trunk.

FossilOrigin-Name: e6a4a16312bf71ed5f277cdcd326003eb2580e72

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 7440de7bde5be204686d85b8bbc18fbb9875210b,3952435799a1b1f19f6ce7c9e9197d2efe02f89a..9d8e4df43ff804148cdfd753dabe9125ac60a0a4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2016-01-20T11:40:31.614
- F Makefile.in 54a13b4520845a7a5f4010f27d4d6e62e9ddea54
 -C Enhance\sthe\scomment\son\sthe\ssqlite3_index_constraint\sobject\sto\sbring\sattention\s\nto\sthe\sfact\sthan\siColumn\sfield\scan\sbe\snegative\sfor\sa\srowid.
 -D 2016-02-02T02:04:21.840
 -F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-02-02T02:30:01.672
++F Makefile.in aa753ba4969643ec65009ff2e55beb95dd38ace4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 01e855f958932d0d3ed62ec675fc63e2cef61fcb
+ F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -10,10 -10,11 +10,11 @@@ F art/sqlite370.eps aa97a671332b432a54e
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
+ F autoconf/Makefile.msc 2ce3b1565a52d7083a1dbf57a1706fd14cc1ee0c
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/configure.ac 2f41055b10873cfe443a08185343e38c47e2f9f0
 -F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa
++F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa w autoconf/README
+ F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -272,7 -271,7 +274,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk bb830e3b6d2ff3afd399107eb7941db41a9ac3bd
 -F main.mk 960071a0bceb043bc5627573986154f507931f33
++F main.mk cbcf106c029aabca5b1e5373237d0b731f60abef
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -291,10 -290,10 +293,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 3744d1452c518e4ce4fe5905c3b0d1da2fe700d1
- F src/btree.h 68ef301795e00cdf1d3ab93abc44a43b7fe771e0
 -F src/btree.c a2a0244ea3f0b3f57f75019c2f229c744ca5d202
++F src/btree.c af43a8326a8af14ae933853850da740f93163383
+ F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 31af80bba31ac159967951ef58f3144cc7db9d70
+ F src/build.c 33dea2cef04c16a902c55f9d83b1a2065f213979
  F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -309,11 -308,11 +311,11 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a00e6d8a843dc22e2c136df04e6300c4528d9b9f
+ F src/insert.c 410f52b9ef4603dc0aebb169b7cb6b3c60eda07e
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
 -F src/main.c b686dabe9a7ece9121da87120d5c7bf402d77eb3
 +F src/main.c 9bef1b75e748da9b66b5dd7c51151e7c14a45d7b
  F src/malloc.c b67c26c359c13836d370350b3f43d228dff5b360
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -332,34 -331,33 +334,34 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 9d109ca95589889ef84a067d60067f2b4d752b96
- F src/os_win.c d5f32f015c52888b76c8919a8b3fa5c532dff497
 -F src/os_unix.c 5bb20172d0c9a6afcfa829a88c406970593c848d
 -F src/os_win.c ccf29ddded3e41e506b6bd98c1171aa0963b23f2
++F src/os_unix.c fb027e79b1c8cc86b69ad5c7175905cf7969275e
++F src/os_win.c dc10ba379eaff9a1b37b4a47671929733971a71e
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 65095e5ea2f9bf458b29288f5a9e626b15874fee
 -F src/pager.c 2916c66aee50f69d9ec56a7619b62d9c6a3bee61
 -F src/pager.h 1c2a49143dfba9e69cc8159ef019f472ed8d260b
++F src/pager.c 29b5eeb8bab35c33b3d698bd29ccf701c0f35173
 +F src/pager.h fe401b665cf964539ac389387de36caeebe606dc
- F src/parse.y caad1e98edeca6960493d0c60d31b76820dd7776
+ F src/parse.y 426a91fbbbf7cdde3fd4b8798de7317a8782bec5
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c 0200623c368b85c17d1f8e5c43822c110c8df54b
 -F src/pragma.c 2ac26ac45eedbed3cc8a9a320ad6d2fc299e69a6
++F src/pragma.c dc702fbc48d0043216c9b56639e59288fd5f4d76
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 83985e45b16345d9fa47a8b6ac26f2c8de926edb
- F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
 -F src/prepare.c db85f0451ba93ecb3c1e497c279abece5cb5aead
++F src/prepare.c cdde978827b7db588dd0dc3c8ff4d9264ceddbb8
+ F src/printf.c 98a5cef7fc84577ab8a3098cfa48ecfa5a70b9f8
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 718954db86277d696c520fe671148db1e9c4ed3c
+ F src/select.c ea6f3b0c279aa37eb3701792d094673a7ad1bf88
  F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
- F src/sqlite.h.in ab6b985903cff07b173cade4a320a16d4636fbd3
- F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 -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 90deb66717cb015573a03d6f4e0cb91b8803fae4
 -F src/sqliteInt.h 2f80b9b1506a8d602b2a99f3f0bfae22df3e7d70
++F src/sqliteInt.h d402565f4804c08a3bacc9727160bacabe53b6c8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c 82979239a896992f9b78efec81cfda05d316a7d0
+ F src/tclsqlite.c 94ef6e2794220c5b6064d4c78ec7169a8c5cc45d
 -F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
 +F src/test1.c f51730220589f17d95dbd6f821e1cb6377d4554c
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -408,31 -406,31 +410,31 @@@ F src/test_windirent.h b12055cab6227f7b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
  F src/tokenize.c 5606871a377f390af7040ec3c12e0d183512d785
- F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
- F src/trigger.c 056e51182a3677434423e3be0c74e61b90b4a663
+ F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
+ F src/trigger.c 72d876b2d0c66604a112362bdae07dae9b104816
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
- F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
- F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
+ F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
+ F src/util.c 72d40df0a52d3f30b462a15f0e094fcbade6dc82
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 2a3f8fd43ffee7cb46da83588fe8ec2da40ece14
 -F src/vdbe.c a0a0ada4b51161d3950fe30fc696b6c8235a841f
++F src/vdbe.c 464142f96d64acdf8755134f8df1d6d83b0003ed
  F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
- F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
- F src/vdbeapi.c a25beee486c67e7e8ec9768ab7474e1bc51fed35
- F src/vdbeaux.c 1f497eb8efd42a707b8fb381a26121b54309599c
+ F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
 -F src/vdbeapi.c 9d640d5efd9a140a6bda8da53b220aa258167993
++F src/vdbeapi.c 29f9b3c19c6ff8cddcb619864657b7bc9836ae35
+ F src/vdbeaux.c f0e7cfa04f7ac44d69866868531dbaf20659d0a2
  F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
  F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
- F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
- F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
+ F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
+ F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 320682cca733115b4cbe71320b5c5eeb1074ebde
- F src/vxworks.h 974e7d9a98f602d6310d563e1dc4e08f9fc48e47
+ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 9bd7a20c656171200725462a37183e53c549afda
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c bb69654f841ae7af0a20cc6fb8f0ac57901c31be
+ F src/where.c af9bf5dcec1a0e52726c550924aa91d837166251
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
- F src/wherecode.c 8dee26eb181ea9daa8b1a4d96f34c0860aaf99bd
+ F src/wherecode.c 923f5d04b379b7417bc29f3b86b5eae9d1923d72
  F src/whereexpr.c 197a448b52073aee43eca3a2233fc113369eb2d4
 -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
@@@ -929,9 -926,9 +931,9 @@@ F test/orderby6.test 8b38138ab097258824
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
- F test/oserror.test 361346396ae18462c7393c1ac5c3f17237bd89b2
+ F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -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
@@@ -1057,18 -1054,18 +1059,18 @@@ F test/spellfix3.test f7bf7b3482971473d
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test a8faa2df39610a037dd372ed872d124260d32953
- F test/stat.test d7607786af4054f277f6d48b2465f27b61f380f7
 -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
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2
 +F test/superlock.test 2b27b4ae7c6b9d534b0412e0d99f989aa1f3b9cf
- F test/symlink.test cbf6cb8c6c4b63a39e9f0f6b0d5c99e249dbc102
+ F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
- F test/syscall.test 2aa9e111b79fb385681ff8940124def6f8faab87
+ F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
  F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
  F test/tabfunc01.test cc33684f9480fcf1fd5ce287ac28d22971cad1cc
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
@@@ -1296,34 -1293,34 +1298,34 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test 65bfc68f3f09dcbc62cee9f794e560428d96cec7
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b1d425f68a1f61d12563f0fa1ee6fca7d5afabf4
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test 40cc49c5e9aac2bb8b058b0e430576d68bb02e2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test 80c314c403888c968bb80f3ce1be84f6e6ccfe2c
 +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 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 932d12a2a36fb2765560d35e7eaa1e5f0b198385
- F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
++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/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/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 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1424,7 -1422,7 +1427,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 d85774e0dcb6cb1958ecd85891ef785e4692f67b 18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
- R a1bfb36fb88552af3000d9b70aef6c27
 -P 6d7d4703ebf3754bec74123d5ba7e861a705f90f
 -R a0fd58918162f72722cea72a597641d9
++P 3ed49691a12455e8583d8b8394ab005124442e89 d8b7b1996eefae7768bfcb82d4ff22c69392aa63
++R e139d9de8e481434dda2ea2485ae061d
  U drh
- Z c70308465d6b08a9a871fab62e6bcea7
 -Z 8a77cde1543981fcb216eb719b02e019
++Z f9f2ac104a3cba480bc61a87b31e4e4a

diff --cc manifest.uuid
index 4d61b60e07a829ee28206eaf8bbd3b308b94de76,dae04066fbaa312f339c9256a39d33056da6fae1..1261de97bdfaeddd2afa87a543738b880817975d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3ed49691a12455e8583d8b8394ab005124442e89
 -d8b7b1996eefae7768bfcb82d4ff22c69392aa63
++e6a4a16312bf71ed5f277cdcd326003eb2580e72

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.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/stat.test
Simple merge

diff --cc test/walcrash.test
Simple merge