From: dan <Dan Kennedy>
Date: Mon, 2 Jun 2025 17:44:10 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb9a1457113af59458ebdd32f39035df3bebe186;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: 7d27451804e525190f8e67da75aaeb3bf2de677021f7566c6681398e60a88c72
---

eb9a1457113af59458ebdd32f39035df3bebe186
diff --cc manifest
index 2ba27879e5,4e0a3e927d..eb9fbb3209
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sa\sfew\stest\sscripts\sso\sthat\sthey\srun\son\swindows.
- D 2025-05-31T19:55:07.528
 -C Slight\smodernization\sof\sthe\sTEA\sREADME.txt.
 -D 2025-06-02T15:17:59.511
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2025-06-02T17:44:10.848
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -726,7 -725,7 +725,7 @@@ F src/auth.c 54ab9c6c5803b47c0d45b76ce2
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 782cc29b42b47e7ec6348eb0aaf9ffe60063f498387e7249f458d445af4b53e9
  F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
- F src/btree.c da98489a981c347cc3a3982ea2810bbb583511a73cc34762547f30dbb4cda7f0
 -F src/btree.c 117c0d408a7d43939419f67de962ce66272e51ac8e84c38e1681a3e8d9c1fa39
++F src/btree.c 53a9c7b243e94c992853d90f1dac0959028433b4b0d27e04409cee04e001b508
  F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50
  F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
  F src/build.c 67c1db4c5e89a8519fe9b6dafc287f6bc3627696b5b8536dc5e06db570d8c05f
@@@ -2209,8 -2207,8 +2209,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9f521ecda2b8d2f383cc84e308b3a4adfcf1bd6339eb834c8fa76c8704c861b7
- R 56c04d3126b92aeee5cfa0b7b54b5339
 -P c9888a409565e6c8891a3dafa56962df364fb729a61df2701dc0bb282e36fb75
 -R 18aff812c0e458ce4faf4f0cc718bfc5
 -U stephan
 -Z c396247e93c4ccc4319211c213bf549c
++P 14a18f4e3a3f35e636262a253364ab1e8054ed38c0c7fd482633522cbcf5ffc4 bf7be67e3fb7b75fc281997f7bf9aa69eaf4da6bdf2fefe359b12d25ec95f512
++R 9d4b9998d3f8edcfb9815d7e9467875d
 +U dan
- Z ced89a3dbbea8e62a4a96a4110c9937a
++Z c11641e9268877729cb4210049f5ff6d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8873e50c22,5045dbdf69..70843368f7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 14a18f4e3a3f35e636262a253364ab1e8054ed38c0c7fd482633522cbcf5ffc4
 -bf7be67e3fb7b75fc281997f7bf9aa69eaf4da6bdf2fefe359b12d25ec95f512
++7d27451804e525190f8e67da75aaeb3bf2de677021f7566c6681398e60a88c72