Merge the pre-3.26.0 fixes from trunk.

FossilOrigin-Name: 2c76ce4f42c486c7c2ead64a602ae02eaefcb1438ed1d401221a2e0ff6c9cf23

diff --cc Makefile.in
index d5fa2443e2f25eb4c2999b72cee09993e91a9bbd,d2f97100597b523c996f46996df03f6c645361ef..426dc4ebd736d5dfe0facc58f521a1ea609909ea
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -564,17 -566,8 +569,19 @@@ EXTHDR += 
    $(TOP)/ext/icu/sqliteicu.h
  EXTHDR += \
    $(TOP)/ext/rtree/sqlite3rtree.h
+ EXTHDR += \
+   $(TOP)/ext/userauth/sqlite3userauth.h
 +EXTHDR += \
 +  $(TOP)/ext/sqlrr/sqlrr.h
 +
 +# If using the amalgamation, use sqlite3.c directly to build the test
 +# fixture.  Otherwise link against libsqlite3.la.  (This distinction is
 +# necessary because the test fixture requires non-API symbols which are
 +# hidden when the library is built via the amalgamation).
 +#
 +TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 +TESTFIXTURE_SRC1 = sqlite3.c
 +TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
  
  # executables needed for testing
  #

diff --cc manifest
index 50d9cb2b5cc1e79d4c3cde4d410a4eca5226a5f3,9280ee718d7ad331a8fe95d77b65f1193712b16c..20e203bb088eaad4053515005f31e074ff9b2e68
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2018-11-26T23:35:13.940
 -C Fix\sthe\sname\sof\sthe\strig\sfunction\sapproximation\sin\sgeopoly.\s\sNo\sfunctional\nchanges\sto\sthe\scode.
 -D 2018-11-29T12:00:02.511
++C Merge\sthe\spre-3.26.0\sfixes\sfrom\strunk.
++D 2018-11-30T18:22:49.115
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 43c6f61e168a54095e6dceff20afc1fe4cb9c35f3f224699972d2aa7b5e494d3
 -F Makefile.in a050c8670ea0d7b37b2192306cbb50d392acd9902b84e9b56f3444d006f97a6c
++F Makefile.in 738271772391d5c571420b38ae7edee6908c90a72a1d32d6ea095df735f2221f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5
+ F Makefile.msc 0d6831ff7951b302e888d86d4c469e2ec3c22f59eba4118b8c38d5a51d9e2d4f
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -361,8 -361,8 +361,8 @@@ F ext/repair/test/checkfreelist01.test 
  F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec
  F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/geopoly.c 6683c99463cc1c53ec9d3a4631d9244505323cb8d8675fda94e8dcb161fc7e33
+ F ext/rtree/geopoly.c d56ff997f2646b03be742eb85e8206f779d777f3a282fe0da576780ca0e11f20
 -F ext/rtree/rtree.c 7125183bf6c37b8b8ee1a04d2b0fe258531fd31650fdd050ed041817f1943d17
 +F ext/rtree/rtree.c 073289c3139481b5a0277a503c77e5744b6803c99ed62ffa7970f28caa76ac7f
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
  F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
  F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@@ -450,10 -447,10 +450,10 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c ba7c7eef4461790f37c309936bfc5d0d6ba9b194b02d3c8ff1fd53b420ea6d3b
 +F src/btree.c 35097c9e303aa3d2d7c9221e3449e75a9208e71143c540018ed02c5b739e08d8
  F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 -F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 +F src/btreeInt.h 5903b9a6710110a483a0501a708fd09975357e7cdc98300208a2071ad7d1750b
- F src/build.c 5bc91901b05ac7a33a324854bd2aa892311e71b82a887f99f390bead39e29175
+ F src/build.c 127d33ad57b455a9339e9fabff41284c8b030cc6247ca7a2a6c0ad7abfc1ce85
  F src/callback.c 789bd33d188146f66c0dd8306472a72d1c05f71924b24a91caf6bd45cf9aba73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@@ -471,9 -468,9 +471,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 6b81aae27b196925d8ff78824f4bbd435d6a40cd38dc324685e21735bb402109
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
- F src/loadext.c 448eab53ecdb566a1259ee2d45ebff9c0bc4a2cf393774488775c33e4fbe89bf
+ F src/loadext.c 9050dd153b5583804184be9c9dee9ebb554178d6db1f8ac280899e8aad9060e6
 -F src/main.c 4cfb3913cc9e65d3ac649b1785ac753fc225d29425d5437e012f7eac0cefe0eb
 +F src/main.c d6b6e142b6c18f41ce5090faca2a9a3befcad21c5d9ea629f3d39d818166b9f4
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -493,29 -490,28 +493,29 @@@ F src/os.c 4c1e6111a933d8167f4b4f38d3b3
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
 -F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 +F src/os_unix.c 21faa3e6e4183c48756a8dab6f8f6d017b24e636c3266ebc3a973b64cc00734a
 +F src/os_win.c 340cb5909334c4ba748987dff2510498e3885bb24c2d9c7632794ed31279f0b5
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c cb92410e2c19168b5358e0a6a12abbe0df90dff20faef2a76c045582738a1119
- F src/pager.h 444928675746f7bbc37b63a0009a5dbad3e6362ab6c5654b43ef2cbe226ab092
 -F src/pager.c 75e0f3cfa3962c714f519f8a3d1e67ecca1c91de0e010a036b988e40ce9e4c73
 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
++F src/pager.c 9e977cf7e340cfc6a17a27de503bad377aa8952105990a2f0089bfbff63d8cb1
++F src/pager.h 0acf77fd717a46c304f52405e19a550101a9efda29154af00d34eedcb7f1d50b
  F src/parse.y 6840fe7c0b5eb4dd25ee5d075213bc8255ed4c0678d71bfb6744d0520d91c179
  F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 77a8848baa3d396b8f597b2e8ba85d82ba00584e45e1c1c27d413712a1b0d88a
 -F src/pcache1.c bf9fcea656dce1cd2cca6b77a1d1d3552050d55a31c98bf0d9f405930a83bc95
 -F src/pragma.c 4e056f042683b99c4ea0db395f68d051b1a95833ab40951c40d3ef7e1fee1354
++F src/pcache1.c 526fbd54dfef9744506c03308120bb3ec660b8ea17f8c01798fd386859657c69
 +F src/pragma.c cf832d9d6fa7699e1c6c18f73b847d3870f8089f8f16f64f3256da6f0911059a
  F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
 -F src/prepare.c f81f8d707e583192c28fea0b2e19385415b7d188123b23f49b038076408d7a69
 +F src/prepare.c f0cc0876b3f5573e2f9aa2089dc3bc73a32d75102ed4a8bc21344e4d010f2575
  F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 4cfc44def0f0690ceaab8f6481f5d76284d7f9509aab6e218a679b4836a54614
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
  F src/shell.c.in 482e23a370cbe5b0d4c73a0f0f5fce34f7caa08a14a8d75e12f0225c4e14915c
- F src/sqlite.h.in f051dee97212c4e5528735259d68ba9b46970952296b0433e02a68102405a431
 -F src/sqlite.h.in cce9feede1c1c03923c091b4bbbd081dd77aaf92024cc2cdbf65f712c2f668c3
++F src/sqlite.h.in 4eea81c4ffc0adeaca97249fc99a2ab6f85f3a7739a7f07ac6afe6ff0f44ee03
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h 1161f7579cdd6217737a66517ef27f4016426603eff492e9b31f45a7d7d4c61f
 +F src/sqliteInt.h d740a15b9e6d1fcc8e0a3fcf32053c447a674027b67fc5195f695a82a85d7573
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -644,10 -640,10 +644,10 @@@ F test/atof1.test ff0b0156fd705b67c506e
  F test/atomic.test 065a453dde33c77ff586d91ccaa6ed419829d492dbb1a5694b8a09f3f9d7d061
  F test/atomic2.test b6863b4aa552543874f80b42fb3063f1c8c2e3d8e56b6562f00a3cc347b5c1da
  F test/atrc.c ec92d56d8fbed9eb3e11aaf1ab98cf7dd59e69dae31f128013f1d97e54e7dfed
- F test/attach.test 9843454e899b839ca7a331fdb07f894f200efe1a081f4aa5f22dd69bcc5dd85b
 -F test/attach.test 21bce8681f780a8d631a5ec7ecd0d849bfe84611257b038ae4ffeccc609d8a4e
++F test/attach.test 5f20de6f9a50ef59ac66d70cb8d76c2ccca46ce4334dc821ae4e16c53093234a
  F test/attach2.test 256bd240da1835fb8408dd59fb7ef71f8358c7a756c46662434d11d07ba3a0ce
  F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 12c4f028e570acf9e0a4b0b7fe6f536e21f3d5ebddcece423603d0569beaf438
  F test/auth.test 3310d9c08e928beca42d3eadaaf53cef619d9d275f598565a3758a21ce63138e
  F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
@@@ -1008,8 -1004,8 +1008,8 @@@ F test/incrblob4.test 21a52a6843a56cdcc
  F test/incrblob_err.test 89372a28f1d98254f03fed705f9efcd34ef61a674df16d2dbb4726944a2de5e9
  F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
- F test/incrvacuum.test d67f6c8330587c6e96e34c19156b67b9f762cd302bdd1d89119fa6edea1ab49b
+ F test/incrvacuum.test 2aaee202b1f230e55779f70d155f6ba67bbdff8481d650214d256ab0f97d4a2b
 -F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
 +F test/incrvacuum2.test 1e873b6caf87ce160d4cb6d8c7a46f0570da1ddc
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test df4cddf4435314a948237fdfa9acee67de21f7bebc789beab4b89b575b4f6a70
@@@ -1185,10 -1181,10 +1186,10 @@@ F test/pcache2.test af7f3deb1a819f77a6d
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test cf0b4e498db1d0143c19641d4420df7cc27fab2c95ed0abd2c7c5753beab25b8
  F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
 -F test/pragma.test c267bf02742c823a191960895b3d52933cebd7beee26757d1ed694f213fcd867
 +F test/pragma.test 5f399fa2dabff786f109d923802b25e533dd99afb536618ef6b45d6ddae9e10f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
- F test/pragma4.test dc17e57003e7b95876bd30b564c089412c7d464098cbee31a8cbeb830036df90
 -F test/pragma4.test 52d8186f9e8d09b87189432cdd401dfa66d0b32445e837fa19046c8ae7621b0e
++F test/pragma4.test e35e8bce8ce0e3790511b281a6d349998bb22b701bceb255b9c8aab402a5b652
  F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test a3e559bc9d922e7fe44e9d05c6965fee34fe3bc28300a4248c6a063425246ffd
@@@ -1592,41 -1588,41 +1593,41 @@@ F test/vtabH.test 3cf9aa1c1c4381b3b3ac3
  F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
  F test/vtabJ.test d7b73675708cf63cfcb9d443bb451fc01a028347275b7311e51f9fdf3ca6757f
  F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
- F test/vtab_err.test 1c476cac24c9c730f83cd7c8bf66482a30151be08d36a2283f87fc38a2dacbb1
+ F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bda2b65
  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 2a525c0f45d709bae3765c71045ccec5df7d100ccbd3a7860fdba46c9addb965
 -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/walprotocol2.test 7d3b6b4bf0b12f8007121b1e6ef714bc99101fb3b48e46371df1db868eebc131
 -F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 +F test/walro.test cac7fa52dffec99f15c6e266769628d711935e4064dbcd7466ce3479b5011eb5
  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 c2bc173d0ca244134ab6bcf8ccd108ee787fb2e7925dbbae973e60fcc6c74851
  F test/where.test 8215d220633f08da331781cf9ede7fb7aed50eb113473c10acd39a643fd258ba
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 2341a294e17193a6b1699ea7f192124a5286ca6acfcc3f4b06d16c931fbcda2c
@@@ -1783,7 -1779,7 +1784,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 977fc44e65f831d4c6184073f44708567081f358904dd76e8df5a82a17977469 6e1330545e7b74fe5f1f20751a3425e2788441485fc07fcb7626e448c72027ce
- R b93e9c5a9a516fb1ac3cbfab9c6e6aff
 -P 62360ceae9d2321003c49cfac3e9f915969a0da12d02c3e633cfa898c0a68566
 -R f7bc600ba0a16071eafe630bad99c9a2
++P e8c20a88c14d496fc79dddcac5db0a47aa037598b3b65a07e4422f7df75cce2c 33576b12b450a37b467ba012e77b297eb80d7147b12a5b23302009bb32455720
++R b063a9d5e86fee2a41ce39f41ed77283
  U drh
- Z 2c943c099e41dca7f57ff07bfcb7f98d
 -Z 3d70394fb420e5973a9d375ccb3cd3d5
++Z fdc6397dcf4f07e7e4d4a994dae2171f

diff --cc manifest.uuid
index 663b884214c370a13e25012ded99b65284f44532,8664bd865ae03de84b62951c52d1211653101d45..40dbdd0b37af8ad4b65a77ec695be7bc74a7d655
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e8c20a88c14d496fc79dddcac5db0a47aa037598b3b65a07e4422f7df75cce2c
 -33576b12b450a37b467ba012e77b297eb80d7147b12a5b23302009bb32455720
++2c76ce4f42c486c7c2ead64a602ae02eaefcb1438ed1d401221a2e0ff6c9cf23

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/pcache1.c
Simple merge

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

diff --cc test/attach.test
Simple merge

diff --cc test/pragma4.test
Simple merge