From: drh <>
Date: Mon, 16 Dec 2024 18:35:13 +0000 (+0000)
Subject: Merge recent trunk changes into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f0d31a7f1aa8a0738cb306e673022fc202cc1a6;p=thirdparty%2Fsqlite.git

Merge recent trunk changes into the reuse-schema branch.

FossilOrigin-Name: ebbc6752bb50d709505402ff5736890a9970f15498552ecfbf01401b97506c90
---

1f0d31a7f1aa8a0738cb306e673022fc202cc1a6
diff --cc manifest
index 56743431d7,09541b416a..5b8e4b217d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sand\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2024-12-16T14:06:18.230
 -C Code\sformatting\schanges\sto\smake\strunk\smore\slike\swal2.
 -D 2024-12-16T18:04:39.151
++C Merge\srecent\strunk\schanges\sinto\sthe\sreuse-schema\sbranch.
++D 2024-12-16T18:35:13.852
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -858,12 -856,12 +858,12 @@@ F src/vdbemem.c df568ef0187e4be2788c351
  F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 -F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422
 +F src/vtab.c dae9ef7d94bd06116c020bc3fb2f9a8e8f8243515aaa72d392fe8e6fc14517c2
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c fcbc36c31df200daa4ed398923ab55a02dbbed9ce22a8a31c5d9bf447a130126
+ F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 -F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2
 +F src/where.c fddbca0954ba3ea0e72cc26e983d593c93eabddf6e78ecf7b9d9c7c3a3d66441
  F src/whereInt.h 1e36ec50392f7cc3d93d1152d4338064cd522b87156a0739388b7e273735f0ca
  F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
  F src/whereexpr.c 0f93a29cabd3a338d09a1f5c6770620a1ac51ec1157f3229502a7e7767c60b6f
@@@ -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 63bac8dd71f729045c0d5c57d084e948c6adf2db4af5ab84d88df156227d58d4 4fab85b3d0d1cad2d185f2456de7ddf281badf8561cc051e10e16655441dcc84
- R 4e52346fb52c9ef8e686ab35e59da522
 -P 4fab85b3d0d1cad2d185f2456de7ddf281badf8561cc051e10e16655441dcc84
 -R 9aaaecad314aea90d45c80b60798b57a
++P 58563686eba573c13b11cf823bbab3392f67d968322fd6ed9076d658d403953c 8f725472b0fe62359a4cd3237b43d7b834e042d8ce425abde06e3ed6c62dbafa
++R f06f6704c1bc80595884c85bc94df4fe
  U drh
- Z 60c49d1abc8d566466d0560325b19c2d
 -Z 2a765bcb487b40c3fb2da87580a07616
++Z ec60b23cd0cd335aa9679814588b0035
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8a870e236c,2eb63b396b..b185f8fba0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58563686eba573c13b11cf823bbab3392f67d968322fd6ed9076d658d403953c
 -8f725472b0fe62359a4cd3237b43d7b834e042d8ce425abde06e3ed6c62dbafa
++ebbc6752bb50d709505402ff5736890a9970f15498552ecfbf01401b97506c90