Merge all version-3.22.0 changes.

FossilOrigin-Name: 27e20d699872b2b84575ca63864163e4ae8b65ecfc33f042dbecde323ccff7c2

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

diff --cc main.mk
Simple merge

diff --cc manifest
index ca4e74dfc7de0dfaed462bdfb6822fbf75adbaeb,59cd9b34a15cc0fa00603e803c718ed6dae39919..5f7689507f2ce65d9336e9d5fde17a363228d45d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\senhancements\sassociated\swith\sthe\sfirst\s3.22.0\sbeta.
- D 2018-01-15T21:59:56.651
 -C Version\s3.22.0
 -D 2018-01-22T18:45:57.681
++C Merge\sall\sversion-3.22.0\schanges.
++D 2018-01-22T19:04:37.999
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
 +F Makefile.in 463c075e31c8dfa9671ce8f070685cdaec6898e3f6032066dd987b8f651ee2e1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc ede26e3fb675e0b3b07627640ce5917154a6ee7f8f2c97424eb5ab5f651cbd56
 +F Makefile.msc 59421cd76b9e4c5eb8018a94850373ab7ca7709660e601e46cf89143c21b88c6
  F README.md d748f58e3ab0fe0307fb4ae0942b415d93dcc4288756e366cc9e7cf8260c093f
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -350,8 -350,8 +350,8 @@@ 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 cc7c46b07a6ff58699ee93c5a1077f23628f3f77c6e823620b71ed33bbd717f9
- F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 -F ext/rtree/rtree.c d941e44ad901da039caebb9f9fa99d81f2a4fc822e67cafe33fa4f6f789074a0
++F ext/rtree/rtree.c d794ab6a802fc507ddd4f2a31a0fa5c8b98dd72e6602c5dc48a1662e2a130bdb
+ F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
  F ext/rtree/rtree1.test 82a353747fcab1083d114b2ac84723dfefdbf86c1a6e1df57bf588c7d4285436
  F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
  F ext/rtree/rtree3.test 2cafe8265d1ff28f206fce88d114f208349df482
@@@ -397,21 -398,18 +398,21 @@@ F ext/session/sessionat.test efe88965e7
  F ext/session/sessiondiff.test ad13dd65664bae26744e1f18eb3cbd5588349b7e9118851d8f9364248d67bcec
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
- F ext/session/sessionstat1.test e3a3f5876ce1526b48f6f447ee0b18960ac683e3fc891791e1ca0c08e823d498
+ F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
- F ext/session/sqlite3session.c a18bfdab0de090597fb50aae734e2cd41bf5e5d394bbd9a2189308f2bc8525d5
- F ext/session/sqlite3session.h cb4d860101ba6d3ac810f18684539b766d24d668fa2436cdde90d711af9464fb
+ F ext/session/sqlite3session.c 989466bba4dff0ede8d4c450b1fc65ca222b87e31193eddbf3931b88bf898a57
+ F ext/session/sqlite3session.h 01774161cbd328fe3d496323655b9cc142317ff1fb1ae15c1232075ea240e3a4
  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 9da4dcf91e30666b2f89dffdb27c9f09b96fdbb72f2745c2f09d5f21ec4ef3b1
 -F main.mk 4d19895cb268021474ade6244119c80b8a3f1d910cb5b13cf5e04f5f37c3d61b
++F main.mk 03f817230bafb8969afa4544cd1f7806ceceebdfc579db06a206ca8259fc7baf
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -430,7 -428,7 +431,7 @@@ F src/auth.c 6277d63837357549fe14e72349
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 811b367bbe23e1dd730d1f11e3e4a2fa2f13cc0d30fe3fb250f5b25c2bc4b1a5
 -F src/btree.c bfc453babec9aa8196ab5db5e588ac5d3f0c398d72faa37296167a84a61c9f2f
++F src/btree.c 656173030bd10759fe2d2eb053e115f5b0905a6088b9c27e35c7daee750a685a
  F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
  F src/btreeInt.h 55b702efce17e5d1941865464227d3802cfc9c7c832fac81d4c94dced47a71fc
  F src/build.c 9f9647454f236cab097f266ae970f899b53c71cadab6756c47e2b2e81392c2a1
@@@ -451,9 -449,9 +452,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 8d5d9c3ab3c4d600a161f389988bdee6a04dad7c4c1754f04f257734b9d1ce8c
+ F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
 -F src/main.c 26918d50dd4a61b8f6f210320a522f46b5e7e592335b6aa664ab15b80b7c239b
 +F src/main.c d464ae1802084dc6bb57be4e7edbb2e40c6ec07df410a04785f909d381d0cf31
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -472,11 -470,11 +473,11 @@@ F src/os.c 1975fc1d821a8095c68000728746
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c a82505be158d8ce42b38dcc9b426187d776904c12cdc68dc8925e1dfcc5cb6ce
 -F src/os_win.c 501dde1ee770f4ffa458bfe1cf376a556de3ab00bb8320d659c5984403991d62
 +F src/os_unix.c 913b3066b089463d23f21ae4925bce675dc352cf8e09552fe7a091166ce2449e
- F src/os_win.c 167aa9bf0a0f55dcd502fd8947f9381fbf5b3dc91c67c47791bf2b7c739abb5a
++F src/os_win.c 51206d5f523a213a5b30b71162a66e4b7b163b9d49fed781932e764b830201b7
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 9b9cb4e06c03d43d62480a7a685a012d645fcf3a39e7767ccb505fb41ee083ec
 -F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
 +F src/pager.c ab8efd8b1e099ef5ada809e6dc17d20b1c2cf28688a3c25836699f5362904bb9
 +F src/pager.h e9718b1a8d0af6162d6818774d95e621fec6f706baa38cc562690b3e4ee0dca0
  F src/parse.y 4e750e1b261ff9f1d0b6b5d40a829c66d691899f48953fde839d8b52d41aa148
  F src/pcache.c 7ae91a4557a43d77d449accbfdc68846e6516f8e2eda46e8bbe4536fb669b201
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
@@@ -489,12 -487,11 +490,12 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c bebe7cce45d899d2237c76bce059d525abf5b861f2fce92f6b53914a961c01ba
- F src/shell.c.in b87abffd0db09203ad8a133d56fe8f154ace5ec0a14197a153fb7d80b1438c01
- F src/sqlite.h.in 1c803f1655c1f527eda3d357b0303e313cc77431b28baa00252421ca7f8a41c0
+ F src/shell.c.in 4e1bcf8c70b8fb97c7cbaca6602e2a291d7fe17eff23a5de003d6fabd87f27d1
 -F src/sqlite.h.in 959deaad89679e31d7f68fda668b0c5d1f592fffed7a9c1740fb8ded4e4e754a
++F src/sqlite.h.in 87027977f9a5606208ad0527da42f097579c3a9169de61589339c1bbb2894acb
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 3737a51c5798e47a8ff2af0720f6dbc00fabd5ea401db392d05b1916085857a6
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 -F src/sqliteInt.h 9c70315598b34810a83e4894455acb18e95cf63ce4e6cbb451ac2d17eabc2544
+ F src/sqlite3ext.h 99189e7611eb0bf98f21c7835dc74730a84e2e809c98e1e31c33896dee7a2849
 +F src/sqliteInt.h eb9c5d563a02d898f4aded82e87ef8a23b8d902a62d8531abf5416070a34989a
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -556,12 -553,12 +557,12 @@@ F src/treeview.c eae35972ff44f67064de2e
  F src/trigger.c a34539c69433276d37b0da9a89c117726ff2d292c0902895af1f393a983cd3a1
  F src/update.c a90a32ffc0100265b0693dbbdbe490756447af181f5ea2c138cce515b08c8795
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
- F src/util.c 7315e97a8dc2c8e19ca64196c652cf0a65d13fd0a211b2cec082062372dc6261
+ F src/util.c ef4a5f904d942e660abade7fbf3e6bdb402dabe9e7c27f3361ecf40b945538b5
  F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 -F src/vdbe.c ccc1e17a30325068ae4f0292e8601997946886d23acc989c68f2a261a2795c70
 +F src/vdbe.c 0537452b0e6b7f61e5dcc22bdf4d4fd7169e164dd183bbf4362d8154c57eb479
  F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
- F src/vdbeInt.h 5442fc816b6cf19c8801724199fd6b77a02eb31a7a174021713f8c59b30e51fa
+ F src/vdbeInt.h c8cfbbc28e37e67a493c3f892fb0596add56a31a00e7537a06049af9ef2f51b0
 -F src/vdbeapi.c 02f773681d06e46454b0606339068d4d4490873dc4a7334bc0c6030552bb2c8c
 +F src/vdbeapi.c b9ca143d095e1ce065655f3950d76aa207aa7f4f3877d79c3506d4ab4bc0cfda
  F src/vdbeaux.c 2756ac68ac259c416554100598fc291870063288cd7e1af22847f57b3e130e56
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 7548dd5af03d24d534a5dbc41e3bbdf1fab83e9c8856a8d2549ed2ccf33d0e80
@@@ -569,10 -566,10 +570,10 @@@ F src/vdbesort.c 731a09e5cb9e96b70c394c
  F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
  F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 5a3f464edd64596f601683ed321d12e6fd93c5fb9afdfb3653d6ffd0fee9c48f
 -F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 +F src/wal.c 605f85c9afd3bfd44008d73951e1f1fa64263bcddd7cc5e03b339a9dd7ccd1d5
 +F src/wal.h bada9007800e82f2765ad9ecd9f96176b45c71db769502e24de49d68c0acef65
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
- F src/where.c 36b92103f726609cc3dbe07c619426bd6886bede455de56ccff54c8e567f5582
+ F src/where.c caf0b6c9d31f22f0b2c91aba723858de52b5d665aaa89034099015aaf9bb8219
  F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
  F src/wherecode.c af1e79154aaa88cd802d6f2e5b945f67eaca7c958d1525fbf8ee19d5bd7b9020
  F src/whereexpr.c 427ea8e96ec24f2a7814c67b8024ad664a9c7656264c4566c34743cb23186e46
@@@ -1232,10 -1228,10 +1233,10 @@@ F test/shell4.test 89ad573879a745974ff2
  F test/shell5.test 23939a4c51f0421330ea61dbd3c74f9c215f5f8d3d1a94846da6ffc777a35458
  F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
  F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
- F test/shell8.test c836470ccde867e1f438a7acad7560805cc04f9dbab84cb55d92925942b76247
+ F test/shell8.test 96be02ea0c21f05b24c1883d7b711a1fa8525a68ab7b636aacf6057876941013
  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 8ab5d2c7c5cd3fe7f172d366e6e74e887cb33cb4
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1530,38 -1526,38 +1531,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 f4160abd02d583d06d7ea9554e7a3f749f6b3410
 -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 5cd57d192ee334c3894330303b5f8cb6789fef49b2c83ad1b50b9b132d0f7ae1
+ F test/walro2.test 6c73e8e4b5ccc55f907f4603ba36458b45c085fb6dfb04f30e3c0babbc1c2f41
  F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 54cdeb02157acc979de41530b804ae7b09552bf1
@@@ -1704,7 -1700,10 +1705,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 2cb5d2a92f6ae4f5eac32cc4af4ccd8dd28b990dcf753d7b9c95811dfcc5d0b3 b0b7d0363acf38c2178e2d3041d8ce2a0de061a51caa64670dbf539ee6d4356b
- R e7e3ed024e6b4804dbe4f9dd3d25dddb
 -P 395f8ea790e6e295800fa8927f0585b2419b9521ef4fd591d51d2a48db2a90c4
 -R e7cccb4f976b9eb07c1586193cc26ec5
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.22.0 *
++P c9d2ec51c873c451b22a476b37b1b09c7f3f8c51e41144d544e7fc677ebf126b 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d
++R 815461761766e5593fce9db3ab30ed2a
  U drh
- Z 1faebefd989cd20d53e9b52bae220821
 -Z 9c0e858ece53e1ee810a8a479ae4dc82
++Z 45505c14fb7bca796054d3937cda0a5d

diff --cc manifest.uuid
index 31c6ad9f450063f80186d47bd599cf72a6e93cf3,ed79ed6466df65a10c081565c94f8628f8bbcd74..9b34d39ba8832b090958b5416a670141c3949779
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c9d2ec51c873c451b22a476b37b1b09c7f3f8c51e41144d544e7fc677ebf126b
 -0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d
++27e20d699872b2b84575ca63864163e4ae8b65ecfc33f042dbecde323ccff7c2

diff --cc src/btree.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc test/walfault.test
Simple merge