From: drh <>
Date: Mon, 18 Nov 2024 21:15:25 +0000 (+0000)
Subject: Merge recent trunk changes into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be66d60b2debb65823c1637498c5de455739c2b;p=thirdparty%2Fsqlite.git

Merge recent trunk changes into the reuse-schema branch.

FossilOrigin-Name: 63bac8dd71f729045c0d5c57d084e948c6adf2db4af5ab84d88df156227d58d4
---

9be66d60b2debb65823c1637498c5de455739c2b
diff --cc manifest
index be8dcf7b87,42c69a71fa..a98ae71f94
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2024-11-18T15:51:41.232
 -C Reduce\sdivergence\sfrom\sbegin-concurrent.
 -D 2024-11-18T18:45:31.904
++C Merge\srecent\strunk\schanges\sinto\sthe\sreuse-schema\sbranch.
++D 2024-11-18T21:15:25.518
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -760,11 -759,11 +760,11 @@@ F src/os_common.h 6c0eb8dd40ef3e12fe585
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
  F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6
 -F src/os_win.c db4baa8f62bbfe3967c71b008cea31a8f2ff337c1667ff4d8a677e697315ff0d
 +F src/os_win.c 43861102577a5157c29335d893e1dc6c808d36a3878003bf0e0d4864b8c53c94
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9
 +F src/pager.c ab7704b78c764cc89f477a0c10e53eb3fee8acc1d1306807354c626513c71a4a
  F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
- F src/parse.y 8ec56598aa0df92428627502267d0d1c9778cc27308f8ffd31dfb2d017a8755f
+ F src/parse.y dcf45a81b61223ac93e61fdfe9b22d635dd371c446e8222634d90aa37e25e5f6
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@@ -2210,8 -2198,8 +2210,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 4e4885a067523d1d7ae67af00414e1beb430b16e150b6d07025645528b2d0da6 e1330ecf170436678c5c235557fb95b8acbf4fad62583edba4af03aff49afbc5
- R 0582fbd00eaa697cd9a64d93ce8f79ed
 -P e0d8f9916c2d899094b71af74f44e089a97db6d80f09eb80a5d8be733c1bf942
 -R 15b624443bf22191f7b1a220224ff1ba
++P 00d021eda4694ba5149fcec1f6563317f87b59c70a779ea6325b2620dd7bf51c 84d41e9d04c62601e84621e8edb3b81abbacc366a6b5e7059f8b6796fade7ffa
++R db64a4908590c9408eb5376a72332c80
  U drh
- Z 4267576d75d7e3187d45433bba2545de
 -Z e17d5ca17fa701911504cdcf5a540396
++Z 8f74c3bfe397b4f1c886b48bee418746
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c59f293f5c,125d18f312..1e5561560f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 00d021eda4694ba5149fcec1f6563317f87b59c70a779ea6325b2620dd7bf51c
 -84d41e9d04c62601e84621e8edb3b81abbacc366a6b5e7059f8b6796fade7ffa
++63bac8dd71f729045c0d5c57d084e948c6adf2db4af5ab84d88df156227d58d4