Merge the latest enhancements from trunk.

FossilOrigin-Name: a658f80c8f3babb6f992f3c5a5b2f87d995239fb24a00f258bd615d39bfda0fa

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 5f7689507f2ce65d9336e9d5fde17a363228d45d,7967a2c6720e69ba38c62eadcb14113e963e0f5c..cc9523817e9f38f189c3a0088b7a523f9c1aab53
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\sversion-3.22.0\schanges.
- D 2018-01-22T19:04:37.999
 -C Add\sthe\sSQLITE_DBSTATUS_CACHE_SPILL\soption\sto\ssqlite3_db_status().
 -D 2018-03-14T15:25:43.797
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2018-03-14T17:17:43.919
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 463c075e31c8dfa9671ce8f070685cdaec6898e3f6032066dd987b8f651ee2e1
 -F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
++F Makefile.in 4b625ed4055e4361ebecc3acc31cbfacba524db4baa1f57d7685591b22e679cb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 59421cd76b9e4c5eb8018a94850373ab7ca7709660e601e46cf89143c21b88c6
- F README.md d748f58e3ab0fe0307fb4ae0942b415d93dcc4288756e366cc9e7cf8260c093f
- F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
 -F Makefile.msc 8a6727b41a4626a5552016f4b0088b43fb14a32f53db1f47e83a0fefcb63c49a
++F Makefile.msc 2f7888401687afdd6f8cb571fd7a933e413de64fa9dc80bc05e700d7f7c4eaa8
+ F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
+ F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -350,14 -352,14 +352,14 @@@ F ext/repair/test/checkfreelist01.test 
  F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
  F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c d794ab6a802fc507ddd4f2a31a0fa5c8b98dd72e6602c5dc48a1662e2a130bdb
 -F ext/rtree/rtree.c bc61010e978b5b8ae6dbb90274a2fbb5db5ff5e2880b5c6e8abd48eea77264db
++F ext/rtree/rtree.c 91716a27f0253d70541d2034c0d7ba1fdaf37f10bf1112cc28baa93838bcc9fa
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
- F ext/rtree/rtree1.test 82a353747fcab1083d114b2ac84723dfefdbf86c1a6e1df57bf588c7d4285436
+ F ext/rtree/rtree1.test 47e2095bebea6813754fd7afa6a20e2b7b4ebcd5cb7dbcb6932b6c9f86bbf972
  F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
  F ext/rtree/rtree3.test 2cafe8265d1ff28f206fce88d114f208349df482
- F ext/rtree/rtree4.test 67b021858ba4334c8d49b3449476942c2ce0e5ef7123538f2e9dd508ed03a12d
- F ext/rtree/rtree5.test 8aaa4bcdc42f718fe165572f5623e4732831aca95a2bc32482d33d4d2cf1325d
- F ext/rtree/rtree6.test 773a90db2dce6a8353dd0d5b64bca69b29761196
+ F ext/rtree/rtree4.test 304de65d484540111b896827e4261815e5dca4ce28eeecd58be648cd73452c4b
+ F ext/rtree/rtree5.test 49c9041d713d54560b315c2c7ef7207ee287eba1b20f8266968a06f2e55d3142
+ F ext/rtree/rtree6.test 916a641d2beac01b9880871ff07612d56c1e466190a27c82ab36ffd58be03b9f
  F ext/rtree/rtree7.test c8fb2e555b128dd0f0bdb520c61380014f497f8a23c40f2e820acc9f9e4fdce5
  F ext/rtree/rtree8.test 649f5a37ec656028a4a32674b9b1183104285a7625a09d2a8f52a1cef72c93f2
  F ext/rtree/rtree9.test c646f12c8c1c68ef015c6c043d86a0c42488e2e68ed1bb1b0771a7ca246cbabf
@@@ -400,19 -402,16 +402,19 @@@ F ext/session/sessionfault.test da273f2
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
  F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
- F ext/session/sqlite3session.c 989466bba4dff0ede8d4c450b1fc65ca222b87e31193eddbf3931b88bf898a57
- F ext/session/sqlite3session.h 01774161cbd328fe3d496323655b9cc142317ff1fb1ae15c1232075ea240e3a4
+ F ext/session/sqlite3session.c 9edfaaa74977ddecd7bbd94e8f844d9b0f6eec22d1d547e806361670db814c1e
+ F ext/session/sqlite3session.h 2e1584b030fbd841cefdce15ba984871978d305f586da2d1972f6e1958fa10b1
  F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 03f817230bafb8969afa4544cd1f7806ceceebdfc579db06a206ca8259fc7baf
 -F main.mk 63668484c95454af7fc04a384da27ac556f27368d6d0c345e405e1677c66768f
++F main.mk 45b052925e378a23b48a72cdf640a4bc08106f71c6d4dce7e5efe4a126168e87
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -431,10 -430,10 +433,10 @@@ F src/auth.c 6277d63837357549fe14e72349
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 656173030bd10759fe2d2eb053e115f5b0905a6088b9c27e35c7daee750a685a
 -F src/btree.c 18a53540aa35dbdf77f715ea928422a4ed9011dc16ea7b50f803fd1617fcc4f5
++F src/btree.c cd68bc5a0ce8e6e18f40131f2a5e0e8cf0e9090877c517c593c5d6ed78d0a3e1
  F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
- F src/btreeInt.h 55b702efce17e5d1941865464227d3802cfc9c7c832fac81d4c94dced47a71fc
- F src/build.c 9f9647454f236cab097f266ae970f899b53c71cadab6756c47e2b2e81392c2a1
+ F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
+ F src/build.c 672022c06e1a5c2653f80c77a687de11f7e65ce81d20fe2825aadfa13a875c33
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
@@@ -452,9 -451,9 +454,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 14686083cedc198540b15a79586cdd4be2acf6d5fa97627e355f817ab07e9fee
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
  F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
- F src/main.c d464ae1802084dc6bb57be4e7edbb2e40c6ec07df410a04785f909d381d0cf31
 -F src/main.c c1e97e4c6fffff1fb1a6f1c48807386819af78657b4ae4acfd6d6d17353b8277
++F src/main.c 6a659285d6d4d0b35a3a3654aad9707a4d5480e5599c8ca5194fc3ec15359772
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -466,41 -466,40 +469,41 @@@ F src/msvc.h 4942752b6a253116baaa8de752
  F src/mutex.c b021263554c8a3995e9d53193b8194b96d1ed28e06c3b532dd7f7d29cf0c7d53
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
- F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
- F src/mutex_w32.c a898fa969823b100c0f5fdc57e54c9a1e419ab4d
+ F src/mutex_unix.c aaf9ebc3f89df28483c52208497a99a02cc3650011422fc9d4c57e4392f7fe58
+ F src/mutex_w32.c 7670d770c94bbfe8289bec9d7f1394c5a00a57c37f892aab6b6612d085255235
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c 22d31db3ca5a96a408fbf1ceeaaebcaf64c87024d2ff9fe1cf2ddbec3e75c104
 +F src/os.c 1975fc1d821a8095c6800072874665413733def2e460896c3e0af6a97d082015
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 913b3066b089463d23f21ae4925bce675dc352cf8e09552fe7a091166ce2449e
- F src/os_win.c 51206d5f523a213a5b30b71162a66e4b7b163b9d49fed781932e764b830201b7
 -F src/os_unix.c 928586cbde31890538854f1657463392d63b2d7794f577774573ae53ec283d7b
 -F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c
++F src/os_unix.c 9cd1f99a87b3431e63dc9eec9f58094e7df01ee13972380eb81566aec980ba8b
++F src/os_win.c 606bb196404afe44f5be7459a3e928347dfd618586abf6e7ff5e7e6bcbac6b83
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c ab8efd8b1e099ef5ada809e6dc17d20b1c2cf28688a3c25836699f5362904bb9
 -F src/pager.c 3e3b659b6b3f40b5a5efef6b8890ced490c397a81d96feb5266fde1f7362e608
 -F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
++F src/pager.c 100dda22f47e99e04e4dbf74b484a140e6e231fd7581504c985262c2ab5baa5d
 +F src/pager.h e9718b1a8d0af6162d6818774d95e621fec6f706baa38cc562690b3e4ee0dca0
- F src/parse.y 4e750e1b261ff9f1d0b6b5d40a829c66d691899f48953fde839d8b52d41aa148
- F src/pcache.c 7ae91a4557a43d77d449accbfdc68846e6516f8e2eda46e8bbe4536fb669b201
+ F src/parse.y 3be4b2b5e33ef7dab3128b765898ee786fc6cd698a7f053f756a68f2f238f0aa
+ F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
 -F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
 -F src/pragma.c bea56df3ae0637768c0da4fbbb8f2492f780980d95000034a105ff291bf7ca69
 +F src/pcache1.c 77a8848baa3d396b8f597b2e8ba85d82ba00584e45e1c1c27d413712a1b0d88a
 +F src/pragma.c a2a221f06f27dafdddbc71ef652a7f0079a274c7efb83a821498dadaf70ca1e4
  F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 -F src/prepare.c 259f4e7960c47082c9653f3d5f0c294abd68bb9c3aab86de7630700cba1c20fb
 +F src/prepare.c 67a2c477a7b5222264eead469af996aa7d07da08aa73c3a11f0de125b4f85e2c
- F src/printf.c 9506b4b96e59c0467047155f09015750cb2878aeda3d39e5610c1192ddc3c41c
+ F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
+ F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c bebe7cce45d899d2237c76bce059d525abf5b861f2fce92f6b53914a961c01ba
- F src/shell.c.in 4e1bcf8c70b8fb97c7cbaca6602e2a291d7fe17eff23a5de003d6fabd87f27d1
- F src/sqlite.h.in 87027977f9a5606208ad0527da42f097579c3a9169de61589339c1bbb2894acb
+ F src/select.c f02352ac5cbb6fad3804add825743b924cfb6c742ba2e8666d726828a9985d73
+ F src/shell.c.in 9b7e7ac1ccdbc045e285e745ff6d21dbec6ce91330f2bdd5db50d5c39f40679e
 -F src/sqlite.h.in 6283ece8dbc3749d78593415a2373f4e7050afce7d18f87acea3b9a48f6fa576
++F src/sqlite.h.in efce8c03ae4d03988e27c5242ba326ff1c38c64e6daebbd06b3bd04a137dbe24
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 99189e7611eb0bf98f21c7835dc74730a84e2e809c98e1e31c33896dee7a2849
- F src/sqliteInt.h eb9c5d563a02d898f4aded82e87ef8a23b8d902a62d8531abf5416070a34989a
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 -F src/sqliteInt.h 2ef60a6d9a50e6eef224e9eae71b29a9fb91c301e882d9fbbb77afd50b6cf815
+ F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
++F src/sqliteInt.h 2769d44c1b548ae9647daa1ef716c92bb99fced170717a9eb8e7f849619edb0e
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
- F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
+ F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c 1833388c01e3b77f4c712185ee7250b9423ee0981ce6ae7e401e47db0319a696
- F src/test1.c 1582be2f8adc96303a2b549860c1d99c288509c54625abd17592a138f407b54e
+ F src/tclsqlite.c 916a92de77ec5cbe27818ca194d8cf0c58aa7ad5b87527098f6aa5a6068800ce
 -F src/test1.c 1ab7cbbb6693e08364c1a9241e2aee17f8c4925e4cc52396be77ae6845a05828
++F src/test1.c 4721cac54658918fc1eaef11db8f2d2704e06680c1f28b90fbd28094e14f34b9
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -515,7 -514,7 +518,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
  F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c c73cd9c29f616e6ea6da7fb287b8034b3cb4534436be3e4df878c90fac9dee2e
 -F src/test_config.c 097c6189803886a1fb26ec37d8bc62b90512cb53ab79a1fb6d35196c1ec42ded
++F src/test_config.c 15d4d8f38d920d20b991a4156e43c95aad465734545a6ae91d46447f1fde17a1
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
@@@ -557,27 -556,27 +560,27 @@@ F src/treeview.c e0d62678314abf0e1e6d09
  F src/trigger.c a34539c69433276d37b0da9a89c117726ff2d292c0902895af1f393a983cd3a1
  F src/update.c a90a32ffc0100265b0693dbbdbe490756447af181f5ea2c138cce515b08c8795
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
- F src/util.c ef4a5f904d942e660abade7fbf3e6bdb402dabe9e7c27f3361ecf40b945538b5
- F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
- F src/vdbe.c 0537452b0e6b7f61e5dcc22bdf4d4fd7169e164dd183bbf4362d8154c57eb479
+ F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
+ F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
 -F src/vdbe.c 88d8e0797bf49624d056014f34f302a7370cc119915cc0ece8f2b7bf5e7c30fb
++F src/vdbe.c 13dc41a8ba9cbf0692a57fba48bff6e2c1998e35a7a4bb00e30f8adba2d975b6
  F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
- F src/vdbeInt.h c8cfbbc28e37e67a493c3f892fb0596add56a31a00e7537a06049af9ef2f51b0
- F src/vdbeapi.c b9ca143d095e1ce065655f3950d76aa207aa7f4f3877d79c3506d4ab4bc0cfda
+ F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 -F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
++F src/vdbeapi.c 2a0564779a2de60964e80155702bcc2060b6dde607c7c1b97b94c9db4234c465
  F src/vdbeaux.c 2756ac68ac259c416554100598fc291870063288cd7e1af22847f57b3e130e56
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c 7548dd5af03d24d534a5dbc41e3bbdf1fab83e9c8856a8d2549ed2ccf33d0e80
+ F src/vdbemem.c 414e28d3a7e2a8bee2bb247de115dcbc68e3cbac284d5862d077002f7a93bce1
  F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
  F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
  F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 605f85c9afd3bfd44008d73951e1f1fa64263bcddd7cc5e03b339a9dd7ccd1d5
 -F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
 -F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
++F src/wal.c fe0187275982737e0576ba2572f75d48a4ac70f37911cb68905644e690d884da
 +F src/wal.h bada9007800e82f2765ad9ecd9f96176b45c71db769502e24de49d68c0acef65
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
- F src/where.c caf0b6c9d31f22f0b2c91aba723858de52b5d665aaa89034099015aaf9bb8219
+ F src/where.c 7cae47e813393d70c6d327fdf000fcb30f76b1b0b5a5b52ff6402e0c658de32c
  F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
- F src/wherecode.c af1e79154aaa88cd802d6f2e5b945f67eaca7c958d1525fbf8ee19d5bd7b9020
- F src/whereexpr.c 427ea8e96ec24f2a7814c67b8024ad664a9c7656264c4566c34743cb23186e46
+ F src/wherecode.c e1aaadd8fec650037cfbf27d1b3470338fb3b58fec34d11082df16fe9a08fbd7
+ F src/whereexpr.c 53532be687e12f3cd314f1e204cd4fbdac7ad250e918a182b048121e16e828ae
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -742,8 -741,8 +745,8 @@@ F test/date.test 9b73bbeb1b82d9c1f44dec
  F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10
  F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
  F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
- F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
- F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
+ F test/dbstatus.test c15fa97f743dac7ce996814c84b56317e138895ee15ce27f15b608aa6924c90a
 -F test/dbstatus2.test 35a987036fefbbc696e65b6a3fbd860864cfd54941c52f50c61b55d4778ac66c
++F test/dbstatus2.test 6305517c4ed584d19c98e4acb7ecf01de92f9b186b1318fcbbd5ce8f09e9c3ca
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -794,10 -793,10 +797,10 @@@ F test/exclusive.test e6b1f19261732fb0c
  F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
- F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
+ F test/expr.test 7cb55e80aeb41d65fec968c08212505123063fea60bdc355d764d747670e9eea
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 07416bd593a116d5893cb244f45a94d5c6fe030561df3bd972e6135f8106e509
 +F test/fallocate.test 0ba4d7f1ca7268519f0f5515f654a924627ba1aa1efddca120d608ddb590b513
  F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
  F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
  F test/fkey1.test d11dbb8a93ead9b5c46ae5d02da016d61245d47662fb2d844c99214f6163f768
@@@ -1034,16 -1034,15 +1038,16 @@@ F test/lock.test be4fe08118fb988fed741f
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test 27143363eda1622f03c133efc8db808fc331afd973486cb571ea71cd717d37b8
 -F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 1f1e0fd1670deef8c0a76e8f895bd5e124133ca4
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
  F test/lock_common.tcl 7ffb45accf6ee91c736df9bafe0806a44358f035
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test b17c99ae3aef96a8c9fa6f6be33cc75b93d657cb791d3827302b6835b71941f7
 -F test/main.test 6bbb3999fd461eb8fb335cbab97409a3d7f91bbb8da60635e8be3e4a04a77772
 +F test/main.test ad8fa65ab7f5d5c6cc4ac287f9d70f21d285361e3ab194fcba16ddf49b7c29d7
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test 21c213365f2cca95ab2d7dc078dc8525f96065f8
- F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
+ F test/malloc.test 18dd1c4188c81ca79cf123527c71b19ee0c31feb9947fdffb0dc6ceb1436816a
+ F test/malloc3.test 6e88bae6312854a4adb4ecc2a6a5ea8c59b4db778b724ba718e1c43fc8c3c136
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test f6eb6eca07a4c75f2897bf43a404689b6295bb95ab2e07d4b52eda743f925a27
  F test/malloc6.test 2f039d9821927eacae43e1831f815e157659a151
@@@ -1064,12 -1063,13 +1068,13 @@@ F test/mallocJ.test b5d1839da331d96223e
  F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
  F test/mallocM.test 78bbe9d3da84a5c679123cdb40d7b2010b18fc46e13897e4f253c6ba6fbff134
 -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/memdb1.test fbe47f36c12725ebdd2760f846371e6eb09f403bd7236fbdddb21aa6e3c652b4
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 +F test/memsubsys1.test 21f6e0e93302665caa03f37bf832afa1e8dde768d3f5547a5c59a03655d3bfaa
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
  F test/minmax2.test dae92964ac87c1d2ef978c582e81a95e11c00f1cbef68980bfb2abaf10315063
@@@ -1119,14 -1120,14 +1125,14 @@@ F test/orderby7.test 3d1383d52ade5b9eb3
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
- F test/ossfuzz.c 7f5cc87a0280a5854c1bfa7d5c4d07d34731f08ec34dc9c916aa35ed292b1468
- F test/ossshell.c 296ab63067841bd1b1e97b46a0b2af48ee7f69d50d1a723008bee12dd7122622
+ F test/ossfuzz.c c4c4547e2c92ac52f10038b073a03248251a23c1c559728f63a18aeca0e79f03
+ F test/ossshell.c f125c5bd16e537a2549aa579b328dd1c59905e7ab1338dfc210e755bb7b69f17
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 -F test/pager1.test f596d3bd53ce96e1d87d44d223d2ae6c8867dd782c425e5eb28b5721fa6aaa97
 +F test/pager1.test 9fe51801e819f06406f115c1a33778dfc1ae1a7804c62bd2b34c9a8f37a70178
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 4e9a83d6ca0838d7c602c9eb93d1357562d9059c1e02ffb138a8271020838370
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
- F test/pagerfault.test 846f67b69457a5838c52c3a4a25817045a7f09225438e3582007a1c81f60016f
 -F test/pagerfault.test 63c5da625562c66345ab4528790327ca63db2f6f9cbae2aba8cb7c51de3d1628
++F test/pagerfault.test 4934ada4438c6bb3f58bbffed5147cd22208ae2dda7837b6e012cf212a3eff51
  F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
@@@ -1165,10 -1166,10 +1171,10 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
  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/rowvalue.test 44f3492f415cc9f374e8388a5eb61503eaca5230
+ F test/rowvalue.test 32861d6a933ded868035f2ec79aeb993a2a46eb7a6d282ae13415a4c2e369463
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1214,7 -1215,9 +1220,9 @@@ F test/selectF.test 21c94e6438f76537b72
  F test/selectG.test 089f7d3d7e6db91566f00b036cb353107a2cca6220eb1cb264085a836dae8840
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
  F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 -F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
+ F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
+ F test/sessionfuzz.c b0fcdcf757451957e17396a3af5171f1fdf9b2babc81da9fa35675df46c4729a
 +F test/shared.test 13376ba3be1c5685ab1ec184189adabd15fa70be
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
  F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
@@@ -1294,15 -1298,15 +1303,15 @@@ F test/tabfunc01.test c47171c36b3d411df
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test c3d7ac9449634b9f17fd048a3c0212e88a7448be810a9c5bd051acc1ffa00d2f
+ F test/tclsqlite.test 5337e8890b96dad1ee541b15fbeec32e6bac2fe7fa096f91089057385aadba9b
 -F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
 +F test/tempdb.test 8d0c2ee1cc2286629ca1d7e4e470a8ecf3951b65fb93c6bb7e27fee8ed9f8055
  F test/tempdb2.test 27e41ed540b2f9b056c2e77e9bddc1b875358507
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl 675251263317a1df31ef9022579502e2dc3dad21bc5f9d89d23f69ff8fc374b1
 -F test/tester.tcl 94901a4625d9a2229666dd5c44120ddf7f0fb639470710ef74a4cefc7b039e07
++F test/tester.tcl 63fca9a766cd84060e137e81419ea5ae384960e3354281ce8e4983e203d53736
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1531,38 -1535,38 +1540,38 @@@ F test/vtabJ.test d7b73675708cf63cfcb9d
  F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 155b9efa999bdb38ce1cd729b9a4fcdbffd6b88be27f039bad1d2929d287d918
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test a8f30a878c6c44dbdd37c9e5bb001245e78b27a8e97f15baf9842bb76f4a155a
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 3d9b79194d15f5b4f6e4169f89f815c049edb2df
  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 e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 09b8ad7e52d2f54bce50e31aa7ea51412bb9f70ac13c74e669ddcd8b48b0d98d
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test cd6e7cff618eaaa5910ce57c3657aa50110397f86213886a2400afb9bfec7b7b
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walfault.test 3771f7c8b159438cbf3c56fdaee07b317fa25857cd30dfd9e0d080993cfba952
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test edef6af21a8ef04b2acc7c14c44609e53d2a3ac4674e233673de439f258dcba4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test a112aba0b79e3adeaa485fed09484b32c654e97df58e454aa8489ac2cd57bf84
 -F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 +F test/walro.test cac7fa52dffec99f15c6e266769628d711935e4064dbcd7466ce3479b5011eb5
- F test/walro2.test 6c73e8e4b5ccc55f907f4603ba36458b45c085fb6dfb04f30e3c0babbc1c2f41
+ F test/walro2.test 0e79dd15cbdb4f482c01ea248373669c732414a726b357d04846a816afafb768
  F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
- F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
++F test/walthread.test c2bc173d0ca244134ab6bcf8ccd108ee787fb2e7925dbbae973e60fcc6c74851
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 54cdeb02157acc979de41530b804ae7b09552bf1
@@@ -1643,7 -1650,7 +1655,7 @@@ F tool/mkshellc.tcl 1f45770aea226ac093a
  F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
- F tool/mksqlite3c.tcl 47f0e91c6abea845d87609bf74dafef1ade8c1693c28bb48f010e9231f0c105f
 -F tool/mksqlite3c.tcl a03cee30de81a2e67b93e5c659f24113a003677c557daeb008205c8e6d4345d6
++F tool/mksqlite3c.tcl 331eb5ff5893189a70df4a2312fb8c4ebc3f941edc631a166bb7c6945474b415
  F tool/mksqlite3h.tcl f92f994d9709aeb9e2b6e6f9fc8b069d2f55202c8e23f453edc44390a25982dc
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1705,7 -1712,8 +1717,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 c9d2ec51c873c451b22a476b37b1b09c7f3f8c51e41144d544e7fc677ebf126b 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d
- R 815461761766e5593fce9db3ab30ed2a
 -P 8fb23d4281915b4507e4d42a300f4b5f958ad88ad408218659c7459775d7b114 3faeb851374471a6f94a6fab3a62c73d03330eae6fc72cd1a277b03ad12dcdd0
 -R 447376723b1921d647ac6ba35140d6b2
 -T +closed 3faeb851374471a6f94a6fab3a62c73d03330eae6fc72cd1a277b03ad12dcdd0
++P 27e20d699872b2b84575ca63864163e4ae8b65ecfc33f042dbecde323ccff7c2 48a06eb02b42a021b835ff9766535805723259b9701b87fb17fa488b133cb53a
++R 2b9ab3a159d521e1ca8e81c6e5e6a15d
  U drh
- Z 45505c14fb7bca796054d3937cda0a5d
 -Z 289c0efb0552dcd852e2b3f3f5063bbc
++Z 3c059a59ae79e229fbadb8b43ff4b995

diff --cc manifest.uuid
index 9b34d39ba8832b090958b5416a670141c3949779,5cd60cc4298d6a237f2f34d59cca6e00c7617bba..2bd597da7337034201b8c8b64d4baab5c8d00282
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 27e20d699872b2b84575ca63864163e4ae8b65ecfc33f042dbecde323ccff7c2
 -48a06eb02b42a021b835ff9766535805723259b9701b87fb17fa488b133cb53a
++a658f80c8f3babb6f992f3c5a5b2f87d995239fb24a00f258bd615d39bfda0fa

diff --cc src/btree.c
Simple merge

diff --cc src/main.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/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
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/dbstatus2.test
index b4b5af369db29bb638e7383fc5923447961b0f65,b75f40b06270605ec3a8f58de5e24fdd430c6762..32d53190d77ef68c6c090ffddab64caeebcfef60
--- 1/test/dbstatus2.test
--- 2/test/dbstatus2.test
+++ b/test/dbstatus2.test
@@@ -37,10 -37,11 +37,14 @@@ proc db_write {db {reset 0}} 
    sqlite3_db_status $db CACHE_WRITE $reset
  }
  
+ proc db_spill {db {reset 0}} {
+   sqlite3_db_status $db CACHE_SPILL $reset
+ }
+ 
  do_test 1.1 {
 +  ifcapable enable_persist_wal {
 +    file_control_persist_wal db 0
 +  }
    db close
    sqlite3 db test.db
    execsql { PRAGMA mmap_size = 0 }

diff --cc test/pagerfault.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/walthread.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge