From: drh <>
Date: Tue, 29 Aug 2023 20:37:39 +0000 (+0000)
Subject: Merge the latest branch-3.43 fixes into the bedrock branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bc42f00d213177150466cdfd0b235c7a7746bfc;p=thirdparty%2Fsqlite.git

Merge the latest branch-3.43 fixes into the bedrock branch.

FossilOrigin-Name: 7e3e007583937c3c239b50c8f65f0951f1c793c5726fcb2fc5c5eadcb54af4f3
---

9bc42f00d213177150466cdfd0b235c7a7746bfc
diff --cc manifest
index 1b2b25d821,301a04cc18..3db10f0799
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\stest\scase\sproblem\sin\swal2recover2.test.
- D 2023-08-24T13:42:10.775
 -C Merge\sthe\sbranch-3.43\sfixes\sinto\sthe\swal2\sbranch.
 -D 2023-08-29T20:24:49.339
++C Merge\sthe\slatest\sbranch-3.43\sfixes\sinto\sthe\sbedrock\sbranch.
++D 2023-08-29T20:37:39.939
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -645,7 -639,7 +645,7 @@@ F src/delete.c cb766727c78e715f9fb7ec8a
  F src/expr.c 1affe0cc049683ef0ef3545d9b6901508556b0ef7e2892a344c3df6d7288d79d
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
- F src/func.c 2c5b3d0c5f9998fa60ef2eda64fcb51d59a950dd0e695cdb5324943c4947c3d9
 -F src/func.c f480d46974ecc84fefdd429377158981b974e0e33d656f1b0e919ba7c4bdd390
++F src/func.c 8169f6fad8dd67a7a2d49abdad5e503107c3ce7ce9381ab11e4bc7620357386c
  F src/global.c 29f56a330ed9d1b5cd9b79ac0ca36f97ac3afc730ff8bfa987b0db9e559d684d
  F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -2129,8 -2106,11 +2129,11 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e7b1ee1a999ced9aaae66d3bf51d93c20909541a83ecba79a19e5573fa7d649e
- R 5c80d9074b4faf9a507a418409423616
- U dan
- Z a39e6907c614cd72c8ea05cb8a6c50e5
 -P 9e927eed2d9e379dd79ef82aa1e41102463c5654b8f4e343bb88bb0daf55c689 692266abd107920ef8bec16c5e2c6226746948140dd8da17cdf2132fee4338f6
 -R 529976639edc44c8d3f11da291811d1d
 -T *branch * wal2-3.43
 -T *sym-wal2-3.43 *
 -T -sym-wal2 *
++P 81361769e17b3d1589c5d0f9991a139963c6633d26bc72f189a69e0391d8f52f 903e997457a70fe8a105d5805d3b14710f60c8196558706a003a50090b87437e
++R 43a2a46a37c464f2935b20b7577faf13
++T *branch * bedrock-3.43
++T *sym-bedrock-3.43 *
++T -sym-bedrock *
+ U drh
 -Z c170c6ce3850b6e25b4fcb0fb9789e15
++Z 6f77e8932ae3b3442834d7aae7458b19
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 10ea169847,40c2cd965d..e97cfbfe99
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 81361769e17b3d1589c5d0f9991a139963c6633d26bc72f189a69e0391d8f52f
 -903e997457a70fe8a105d5805d3b14710f60c8196558706a003a50090b87437e
++7e3e007583937c3c239b50c8f65f0951f1c793c5726fcb2fc5c5eadcb54af4f3