From: dan <Dan Kennedy>
Date: Mon, 27 Jun 2022 21:43:33 +0000 (+0000)
Subject: Merge in fix for wal2 recovery.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00a7db72ce69b1f046156968058180534d29e64e;p=thirdparty%2Fsqlite.git

Merge in fix for wal2 recovery.

FossilOrigin-Name: 41d4f14bc657f361976c51e1e0d38d2dd2440127fd230f80a1eb8f2a03bc9325
---

00a7db72ce69b1f046156968058180534d29e64e
diff --cc manifest
index 9839cb02f7,8cd56d9d96..d83ae52fa9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sversion\s3.39.0\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2022-06-25T17:08:25.541
 -C Fix\sa\sproblem\scausing\sfalse\scorruption\sreports\sfollowing\srecovery\sof\sa\s*-wal\sfile\sthat\scontains\sone\sor\smore\stransactions\sand\sa\s*-wal2\sfile\sthat\scontains\sa\svalid\sheader\sbut\sno\svalid\stransactions.
 -D 2022-06-27T21:42:45.196
++C Merge\sin\sfix\sfor\swal2\srecovery.
++D 2022-06-27T21:43:33.502
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -662,8 -656,8 +662,8 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
  F src/vtab.c 3d72c780d1ea08906a198e4f033921a658a54590e3ed72c544995d84f3f9464a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 8d7c4c78e403062d31a9c88638cfd1403849830517a9a4973a3db5d82ddd233d
 -F src/wal.c f5fcbb7c5692690d877fb65f97f392cfd6a568e56c765c3f3f18bb9ed82409ed
 -F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
++F src/wal.c 393ffbef8381b50265a3f0de5cf3c68d0df6c6867df429c5719c2446e9254126
 +F src/wal.h 7a733af13b966ecb81872ce397e862116b3575ea53245b90b139a2873ee87825
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
  F src/where.c 9a44063e60d8f42dd9dc8147b8e8dcfc315bbd13e25c395211292c36d828c869
  F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
@@@ -1791,12 -1772,13 +1791,13 @@@ F test/wal2fault.test 2e8e60cacd5bcd451
  F test/wal2lock.test 0ef98d72dc6bcf7711dedd684760488400d9a9a6eec0dc5d3822060437793552
  F test/wal2openclose.test 2b26be723ea7f4263c8d5d70b37efd1c359561a0526e39466c45fe8e6478daee
  F test/wal2recover.test ba8f4bc9397c838734619f9e759bd98b00e355347b3cf80a2e677610d231d5d8
 -F test/wal2recover2.test 0c46afc759e4392a3c12fba17432b880c93a13bf4246d1be5101b00bae4c5f01
 +F test/wal2recover2.test 698bd0da28b84f470dc5dd50340401fdb50cf8d7894de27d55b61d22130bb1e1
+ F test/wal2recover3.test 4a91689e165a38bc401736e6518188c2b0ff4fa1566d1810b8867536db128177
  F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
  F test/wal2rollback.test 23adc4a099b23f6aaea8b04fdca1c35861d887dd80f8be7da2d5273eb777e428
 -F test/wal2savepoint.test 2c82bd6a6ee5066c156040d2e9c2415646fcf96116ae7ad127eaf0c0b4a85f22
 +F test/wal2savepoint.test 3793a0ae97011fca358f79775f5d7d9f85da75c8e67686e2e19713da0cb0d99c
  F test/wal2simple.test 320a08927f307d0ead26fa3fcef4e3f64279f49be9504f918cb33294f75aeec8
 -F test/wal2snapshot.test 7a5f4629a3c43a43c3440b8b2ea9f07de91a46b0b9eea5f08f62b5bf5b6468df
 +F test/wal2snapshot.test f6c3945bea572fd8745774e95b8dca1e5832c696e2251bb0db33391ee567fe60
  F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
@@@ -2012,8 -1992,8 +2013,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d3fa692179fb2e704e22f1fa0a64152bd0d6d6b531e359fa038eecf909373d97 ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
- R 2fdb6eee279557a448a7092c530a5c13
- U drh
- Z 8186556c8d69c75aa7307dee637a1388
 -P ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
 -R 5eb4043659412b932d516effbdde5301
++P 09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337 f6eafb65a43c650b065abe4a59e329c977cab1856c72dc9162046576d7bbfc8a
++R f31799482b95bcae31b3d170db6dd533
+ U dan
 -Z 7526c786ad8a0ce3d92bc4d2c949f076
++Z 2366a33723999b5fb13a7962cf9ee9da
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index bbd95b2498,b34953287d..f15fd92178
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337
 -f6eafb65a43c650b065abe4a59e329c977cab1856c72dc9162046576d7bbfc8a
++41d4f14bc657f361976c51e1e0d38d2dd2440127fd230f80a1eb8f2a03bc9325