From: drh <>
Date: Mon, 9 Aug 2021 18:26:05 +0000 (+0000)
Subject: Merge recent trunk enhancements into the wal2 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2303f0859c342f15f688bbadf3b657f7be6046bd;p=thirdparty%2Fsqlite.git

Merge recent trunk enhancements into the wal2 branch.

FossilOrigin-Name: 84dac820a0b1f2af73f9563a137b2c57c4c13debcc864063c39027dc8de95ca6
---

2303f0859c342f15f688bbadf3b657f7be6046bd
diff --cc manifest
index afe8e5ac0a,969df8ecab..82ab4e66d8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2021-08-09T11:03:15.407
 -C Further\simprovements\sto\sthe\seOpenState\sbit\svalues.
 -D 2021-08-09T18:13:38.173
++C Merge\srecent\strunk\senhancements\sinto\sthe\swal2\sbranch.
++D 2021-08-09T18:26:05.712
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -538,8 -536,8 +538,8 @@@ F src/pager.h 9d38ac4b9f0e1361f7ddb6aa0
  F src/parse.y 0ba0baec5de6921ec8ba8bbcf1018969144ef29d26112e17539d8fbb1662e3eb
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
+ F src/pcache1.c 00541fef31d2798dc20308ee1fa46205b76ad1df2c871e9c9bfe9508e59ab54c
 -F src/pragma.c af0f43789545622fd5377d71f6d4c0e7c9b9295a3f5d5b1242e4032d38ca12b5
 +F src/pragma.c f1d34e15bdd626a361109f1360f64679b408000335e1c51a5314fd633ed2442f
  F src/pragma.h a11b4798f9c49f156f130e1f7041a9fcc9d316a64f3501b6013acdd2e4c6f549
  F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
@@@ -1932,7 -1920,7 +1932,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 f615d7baa889030b230e0d4f018dc9f8a6fe95cd3a671d7e2b941ae3240fa6ca e5d6512aa1fa0016a679c6e0cb665a0c67ad16f1daa0c18a96b2ebae1beefd15
- R db468eb0f595d4c93b49c1a0eb86a419
- U dan
- Z d6568dd0a12dbf2583fc286518a53959
 -P bf9d70fc2fde06a3f132270a26d4abe321687169066aff26ad9e92757c7f9ee4
 -R a9151e310251de143fbd3b8abd808680
 -U mistachkin
 -Z e0914599a10f85fbe60bdb3fef5eb7e0
++P 67ed7422f8173f95598a6b32447b9200ec369cadae71942c3e87c41d492cfc28 d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
++R 7528fbeaa2ec90ff2790f089ad842620
++U drh
++Z 0a899a8b1cab1555da1551c6a772cd42
diff --cc manifest.uuid
index 8b1afa8399,b870135606..aeb456fdbc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 67ed7422f8173f95598a6b32447b9200ec369cadae71942c3e87c41d492cfc28
 -d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
++84dac820a0b1f2af73f9563a137b2c57c4c13debcc864063c39027dc8de95ca6