From: stephan <stephan@noemail.net>
Date: Mon, 23 Sep 2024 17:06:06 +0000 (+0000)
Subject: Merge current trunk into this branch.
X-Git-Tag: version-3.47.0~88^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d69b4249ffea7614e94ca23b0ca15a6ebec8972d;p=thirdparty%2Fsqlite.git

Merge current trunk into this branch.

FossilOrigin-Name: ed47d7f9a44b2af8ab7dd956495e71ea9a159cec438d1909f7022254a779e068
---

d69b4249ffea7614e94ca23b0ca15a6ebec8972d
diff --cc manifest
index aabb52df01,ca881335f6..9683bfacfb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sinto\sthe\swasm-build-rework\sbranch.
- D 2024-08-25T12:04:05.623
 -C Add\sthe\srun-fuzzcheck\starget\sto\sthe\sMSVC\smakefile.
 -D 2024-09-21T17:27:47.017
++C Merge\scurrent\strunk\sinto\sthis\sbranch.
++D 2024-09-23T17:06:06.957
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -433,6 -435,7 +435,7 @@@ F ext/misc/urifuncs.c f71360d14fa9e7626
  F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
  F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
  F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d
 -F ext/misc/vfstrace.c ac76a4ac4d907774fd423cc2b61410c756f9d0782e27cf6032e058594accaaca
++F ext/misc/vfstrace.c ac76a4ac4d907774fd423cc2b61410c756f9d0782e27cf6032e058594accaaca w src/test_vfstrace.c
  F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5
  F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
  F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668
@@@ -2208,8 -2213,8 +2211,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 900a593ddf51eebddb70e2e9ab16abe4911f58f23e574e88ed340a919b8f16b6 9ef8317faebc29d016bdf2e8c678fb21ca2cfa95272f1f18b461fcaf0e220ac5
- R 18dc15cd32835420757efc0bd71059bc
 -P 62e11a3a78edf9853b74d6495ccd8ae9ac1966c7d78eb3682cf2d5885e3740ec
 -R 44ce456c4e740a869984e636809287df
 -U drh
 -Z fb345da7ed81e5875e018c3667e473a3
++P a1cf3095a87e101ff83ad64f20ae2e61858c7049181abfb18aece6f0a8451c15 2e5194407a1b34dd0659c350ea8098bfef7b3f11aa5b2a07ecd2bce5582655a2
++R df1e63607b5dc38491534a54bc1b4ba5
 +U stephan
- Z 7297c582dbef4ab4eafb733b4bb63970
++Z 777957ea3a8879fa12050cc8a1414fec
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f4799b7609,c7adf060ec..22bb15e6be
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a1cf3095a87e101ff83ad64f20ae2e61858c7049181abfb18aece6f0a8451c15
 -2e5194407a1b34dd0659c350ea8098bfef7b3f11aa5b2a07ecd2bce5582655a2
++ed47d7f9a44b2af8ab7dd956495e71ea9a159cec438d1909f7022254a779e068