Merge updates from trunk - FTS5 fixes and enhancemenets to the tests scripts

so that they work with SEE.

FossilOrigin-Name: f41a7361a1c59d0d681f2a81c2f70c1a9bbf7aee

diff --cc manifest
index c38418549633f19f519d563effb838b804335e37,5b830ffdfa4028163395a56b37700694b6c69804..6e8456596512c74e92853031f29f1f73c4bbdfcc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\schanges\sfrom\strunk,\sespecially\sthe\sSQLITE_DEFAULT_SYNCHRONOUS\nenhancements.
- D 2016-03-08T16:35:17.731
 -C More\stest-case\schanges\sso\sthat\severything\sworks\swhen\sthe\sreserved_bytes\nvalue\sin\sthe\sheader\sis\snon-zero.
 -D 2016-03-15T12:37:08.820
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\supdates\sfrom\strunk\s-\sFTS5\sfixes\sand\senhancemenets\sto\sthe\stests\sscripts\nso\sthat\sthey\swork\swith\sSEE.
++D 2016-03-15T12:45:43.061
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -296,10 -294,10 +297,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 1e36580a1f17f02d04e2a8dba70af6194290e9c2
 -F src/btree.c 6eee126fe9d1f57118de9be2be840a4c6e691828
++F src/btree.c 119943fda9a5bc6c374019f2b2abac5ecb474d27
  F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 43b93fe757bfffe00f97462596418b052eefdccd
+ F src/build.c 213cbf84e99dd834e6ea46615633656d7ef79321
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -336,11 -334,11 +337,11 @@@ F src/os.c 4bcb5173e2b51e254397fbed13ed
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
 -F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 +F src/os_unix.c 4547ba822e88bbbb4749730fb0825e8428485610
 +F src/os_win.c 390534cac9a3730d589241d4c452901bd2aaf7bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 18595a8878be571377a3d84651e714c58951a16a
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
++F src/pager.c 2c38bcb3117c4268a89a26a03a9abf2617002a2f
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
@@@ -354,11 -352,10 +355,11 @@@ F src/resolve.c b8f7174e5f8c33c44ded3a2
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/sqlite.h.in 427f02cf8a6e461c50f98a8663fd8f582e659456
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 8c9346a756302b27b1244f6177cfd6bc33a0907d
 -F src/sqliteInt.h 84c673f27b77dfbd367cb3ed1de8b6f3b73102dc
++F src/sqliteInt.h f62754378123246adae7ea1d48de34764ba168b6
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -417,12 -414,12 +418,12 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 12800a93f0664f41575f96799eb881a786d565e6
+ F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
 +F src/vdbe.c 5c09ebeb5d59ca587e0c1d23cdbcddd99864bfe5
  F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
  F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
  F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
@@@ -430,10 -427,10 +431,10 @@@ F src/vdbesort.c 307460bfa4de4d1c3901fc
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c c09752cafff70ccac871bd53dd7adc9b7331c919
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c dff52f7f0842430f80a7017c7859124685b08453
+ F src/where.c 5533002ddf4fbc256f450cb629668a200b06a3ce
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
  F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
@@@ -629,19 -626,19 +630,19 @@@ F test/enc.test e54531cd6bf941ee6760be0
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
  F test/enc3.test 6807f7a7740a00361ca8d0ccd66bc60c8dc5f2b6
  F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
- F test/eqp.test 85873fa5816c48915c82c4e74cb5c35a5b48160f
+ F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
  F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 -F test/exclusive.test f48243eaf40e0957215501a12f510a8644d13a02
 +F test/exclusive.test 1191e8904ca4b365ca4c67f2c879bed747ac0c3d
  F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
  F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787
- F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
+ F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c
  F test/fkey1.test 13e3d48236a2b9f5c5ebd232eef9b3ab682a8a2c
  F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
@@@ -792,12 -789,12 +793,12 @@@ F test/in.test 61a24ae38d4b64ec69f06ccd
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
- F test/in5.test 1de657472fa9ac2924be25c2c959ac5ca1aae554
- F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
+ F test/in5.test acc710c12af118df5f8645eaba9479f5619eed81
+ F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
  F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
- F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
+ F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
@@@ -888,12 -884,12 +889,12 @@@ F test/mallocI.test a88c2b9627c8506bf47
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  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 6e741378471c2e3a615782fd8923d99ac3a2c002
 -F test/memsubsys1.test 0311bfb4edd2615e3aa56c7a9cf44574e4229077
++F test/memsubsys1.test 43f8c0e0e3be71d559d75f6ca6fbe22810cd9228
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -908,12 -904,12 +909,12 @@@ F test/misc6.test 953cc693924d88e6117ae
  F test/misc7.test edd0b63e2ee29a256900b0514f6fff27e19e9bb2
  F test/misc8.test 21ac9d35a5e110279ae9e1588b8914f54de1c60b
  F test/misuse.test 3c34719944ba045cc6c188a4852ba04680728912
- F test/mmap1.test 44a5ff1c1bcc7dcf2de50227d1f997e75a8ef1ae
+ F test/mmap1.test d2cfc1635171c434dcff0ece2f1c8e0a658807ce
  F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
- F test/mmap3.test c92273e16eb8d23c1d55c9815b446bb72ef0512e
+ F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
  F test/mmap4.test 2e2b4e32555b58da15176e6fe750f17c9dcf7f93
  F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
 -F test/multiplex.test efd015ca0b5b4a57dc9535b8feb1273eebeadb60
 +F test/multiplex.test 2ed4db53c3304b7eb7b8744206ee9271799a32eb
  F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
  F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
  F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
@@@ -941,23 -937,23 +942,23 @@@ F test/orderby8.test 23ef1a5d72bd3adcc2
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
- F test/pager1.test c92c8acdc5675e85a06db43e4b5dca0fe9e3a374
 -F test/pager1.test 841868017e9dd3cb459b8d78862091a7d9cff21d
++F test/pager1.test 15d423765637d8cd54b025f90ed6c8dc311e2fc3
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
 -F test/pagerfault.test ae9ee0db5a30aecda9db8290ce3dd12e5f7bbaa1
 +F test/pagerfault.test 3ae5dafba16772a2349af57ebc5549fcf14646b0
  F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
- F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
+ F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 64abe58d53cde4adcfb881e37aa5ea1b2a980e58
- F test/pragma.test 70826dc1f03bc0b051d4c907d4572c704d38dc58
+ F test/permutations.test af8067e4b6d684518956f8e2a744f42bde99014d
 -F test/pragma.test afbf028be1c35b68f57db8eb015c4a3c59d8f28e
++F test/pragma.test 79a4a492ec23f80af576704fba20ae0333545eb4
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
- F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
+ F test/pragma3.test 3f1984a04657331f838df5c519b443c2088df922
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1029,14 -1025,14 +1030,14 @@@ F test/sharedA.test 0cdf1a76dfa00e6beee
  F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
  F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test a45b424ec23a4b946848ff9e1af5186c677162ab
- F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
- F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
- F test/shell4.test f43e250139dc5dc5f0f2ec1752c50284a1ede102
- F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
+ F test/shell1.test e7dac9830b7d80432be9cebfae06eff9c18675f5
+ F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777
+ F test/shell3.test c39453d3012a39ffec944566eca8a6bda10a2284
+ F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
+ F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test d37a75b4be4eb9dedeb69b4f38b1d0a74b5021d7
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1068,15 -1064,15 +1069,15 @@@ F test/spellfix3.test 0f9efaaa502a0e0a0
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
- F test/stat.test b091791ccaa62ce49a3e7886cab1a69fa9be17a8
 -F test/stat.test b65bad7120c52583b8f0054d99eff80718119a77
++F test/stat.test 688f0f9bca137ae95a6d237728064a7b7e31fded
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  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 2b27b4ae7c6b9d534b0412e0d99f989aa1f3b9cf
 -F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
++F test/superlock.test c86eacd6cead5da9c5ecd25f3d46fca30a927ef2
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test 2f607e1821aa3af3c5c53b58835c05e511c95899
  F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
@@@ -1085,11 -1081,11 +1086,11 @@@ F test/tabfunc01.test f977868fa8bb7beb4
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
+ F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl b05f6c394040d5cd20f7b6f336931e5db6f7f9cd
 -F test/tester.tcl 859a7ccbe5bd65f0f8b524cd51c318d3edcd3008
++F test/tester.tcl 8b7a789e6cd1686b0f90d9881eddc39c29006324
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1307,37 -1303,37 +1308,37 @@@ 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 21c1bc3ca769350746cbaf0ba02119bc61e9c4ec
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 25ae059e900dbb584e0775627e45415ba5940df1
 -F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
++F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test 7373f2079caaa3cd7648ad78b915d6253e87647a
 +F test/wal3.test 3f0fd7eae5969f5ad65a16fe6b50be444f16a6e5
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
- F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
++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 c35dd183708148120928dca908641c361f58062c
++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 67339b9e54db0cdaaf21287349bc8056e2919f96
++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/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 dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 059cb75484a1ecf6357a2c1b3324b8156749221e
- F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 -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 af78c55589cbc82d793449493adba0dc3d659f23
+ F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
  F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
@@@ -1460,7 -1456,7 +1461,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 58023bfccce40c611791c1963d47b620ffb9447a f6d3156ba9af1da517dd77c1df03fa7869888463
- R 36723552f7c038204b97cfe93a212e72
 -P 051c61ebae921b70f843c55aacf046a9922cc187
 -R 1b522ee9926e242e3422d1eddaaf0fbf
++P 29741941238643dc0e41660d98b176d81f9fd6f1 2fd095b14b03a508169bba710d2e8e2addf4b8f5
++R 63c2c1cb5d88035e8f33497857fcd30c
  U drh
- Z 03e62dca0a3e19f8c31fdfa6d9f10928
 -Z 3fc58440746cd83f06c07d7c16cdd74a
++Z b5460bf2e89971c752b54eb934a8cba2

diff --cc manifest.uuid
index bc75543d7caf439fcdb86b7382a66945e52e6241,e76d63af7399722a04cea2da443386bf5aa6452e..a43b483b3497d95a88a115b9ff89567ae19c0399
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29741941238643dc0e41660d98b176d81f9fd6f1
 -2fd095b14b03a508169bba710d2e8e2addf4b8f5
++f41a7361a1c59d0d681f2a81c2f70c1a9bbf7aee

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/memsubsys1.test
index 0d3d40626494fad499bb53aa2b8b13cd02257ff1,e9a4cf08a85d29acb3ee796d3cc2d2319774618e..b85f2c5d0c1a58dcf623c36d4f94e2ef7336326c
--- 1/test/memsubsys1.test
--- 2/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@@ -259,15 -250,13 +259,15 @@@ do_test memsubsys1-7.3 
    set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
    expr {$pg_used<24}
  } 1
 -do_test memsubsys1-7.4 {
 -  set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 -} 0
 -do_test memsubsys1-7.5 {
 -  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
 -  expr {$maxreq<4100 + 4200*[nonzero_reserved_bytes]}
 -} 1
 +if !$::sqlite_options(enable_purgeable_pcache) {
 +  do_test memsubsys1-7.4 {
 +    set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 +  } 0
 +  do_test memsubsys1-7.5 {
 +    set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-     expr {$maxreq<4100}
++    expr {$maxreq<4100 + 4200*[nonzero_reserved_bytes]}
 +  } 1
 +}
  do_test memsubsys1-7.6 {
    set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
  } 1

diff --cc test/pager1.test
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/stat.test
Simple merge

diff --cc test/superlock.test
index 50b09946ae62de973cc1fe50fb9566084f588d59,704b0677a144b8b5dd1745a3f25d138c68097c16..2683a0dc688c316d23457619aa4acfa7d8fa65d6
--- 1/test/superlock.test
--- 2/test/superlock.test
+++ b/test/superlock.test
@@@ -13,9 -13,9 +13,10 @@@
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl
  source $testdir/lock_common.tcl
 +source $testdir/wal_common.tcl
  
  set testprefix superlock
+ do_not_use_codec
  
  # Test organization:
  #

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
Simple merge

diff --cc test/wal5.test
index 2ceae740b6aa568fd47a962cf69c66a77f4e685b,50c517286a9d778a20c2c06656e054cc84d47934..f1bb8666b99bdee36c7f737294b89704f21e7894
--- 1/test/wal5.test
--- 2/test/wal5.test
+++ b/test/wal5.test
@@@ -18,7 -18,7 +18,8 @@@ source $testdir/tester.tc
  source $testdir/lock_common.tcl
  source $testdir/wal_common.tcl
  ifcapable !wal {finish_test ; return }
 +if ![wal_is_ok] { finish_test; return }
+ do_not_use_codec
  
  set testprefix wal5
  

diff --cc test/wal8.test
index fe2e926206119aca81600e4c9e91db1be35bf96f,3e5a0c2617599a093181b231f88ade992a7a7f7f..dd1c0ac7f1e9b9db01e51d88232c6eb4e5f4e97d
--- 1/test/wal8.test
--- 2/test/wal8.test
+++ b/test/wal8.test
@@@ -26,9 -26,8 +26,10 @@@
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl
  set ::testprefix wal8
 +
  ifcapable !wal {finish_test ; return }
 +if ![wal_is_ok] { finish_test; return }
+ do_not_use_codec
  
  db close
  forcedelete test.db test.db-wal

diff --cc test/walbak.test
Simple merge

diff --cc test/walro.test
Simple merge