From: drh <>
Date: Tue, 24 Dec 2024 01:05:30 +0000 (+0000)
Subject: Merge the latest trunk changes into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfb65ee64385585ba50d88a465bcde76422c7cf4;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the reuse-schema branch.

FossilOrigin-Name: 5149d50f3473f2035fe6a9b0e25e33e58f95149a7a39bd19e678ed4cc7de6ccf
---

dfb65ee64385585ba50d88a465bcde76422c7cf4
diff --cc manifest
index 5b8e4b217d,2e54ede973..bca6c8497f
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\sreuse-schema\sbranch.
- D 2024-12-16T18:35:13.852
 -C In\sthe\s(debugging)\srtreenode()\sfunction,\sdo\snot\soverride\san\serror\scoming\sout\nof\ssqlite3_result_text().
 -D 2024-12-22T21:17:27.858
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sreuse-schema\sbranch.
++D 2024-12-24T01:05:30.049
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
  F Makefile.in ad349acf91b3569033439fe498fa197aa530cafaa01362eb7daad2f84e43d265
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc edc6a0332833e496e64e5beb2c9282a859fbdd6abcc2f641f7436157ad219e92
 -F Makefile.msc eed0c40c365d100f3329e8fb7d0e18bad09a6f0c026aa1e4dc7f88270378929d
++F Makefile.msc 28af67e6bd0df8d41f305cce235737d1b7e40511e9e56b8456d651c00acc7bbe
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -2214,8 -2202,8 +2214,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 58563686eba573c13b11cf823bbab3392f67d968322fd6ed9076d658d403953c 8f725472b0fe62359a4cd3237b43d7b834e042d8ce425abde06e3ed6c62dbafa
- R f06f6704c1bc80595884c85bc94df4fe
 -P 536fff14acb3335ad00fb1165cfb2f97e7a31c36273b9b97ffdb4b572fe72c08
 -R 4447fcd0ccb80498c83515e29fbbdcc2
++P ebbc6752bb50d709505402ff5736890a9970f15498552ecfbf01401b97506c90 286559dfb3ad01fcf34360991a108dbe6bf81e7919c461ada6c691ee8f43868f
++R f782b7cb9b0e94e6a226a0176fb388d7
  U drh
- Z ec60b23cd0cd335aa9679814588b0035
 -Z 75ed33204df12b76c729fccd2a0270dd
++Z 210449dde477f151712781a4a6ad14ef
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b185f8fba0,7604fcbe51..36966b7ec5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ebbc6752bb50d709505402ff5736890a9970f15498552ecfbf01401b97506c90
 -286559dfb3ad01fcf34360991a108dbe6bf81e7919c461ada6c691ee8f43868f
++5149d50f3473f2035fe6a9b0e25e33e58f95149a7a39bd19e678ed4cc7de6ccf