From: drh <>
Date: Tue, 28 Oct 2025 15:03:38 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the bedrock branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69982ae43031bcf04305876e499221bb4d603de4;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the bedrock branch.

FossilOrigin-Name: 6639bed2bb1ab81dd4f52eec84045c5e74291db84671ae768029d6c6c54d60ee
---

69982ae43031bcf04305876e499221bb4d603de4
diff --cc manifest
index 3ceebe729c,f33932d529..0f68319585
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sup\sinto\sthe\sbedrock\sbranch
- D 2025-10-27T12:01:56.410
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
 -D 2025-10-28T14:58:14.930
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbedrock\sbranch.
++D 2025-10-28T15:03:38.878
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -681,14 -675,14 +681,14 @@@ F src/analyze.c ebfe8c9c55e44c5ca2bb885
  F src/attach.c 9af61b63b10ee702b1594ecd24fb8cea0839cfdb6addee52fba26fa879f5db9d
  F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 -F src/bitvec.c e242d4496774dfc88fa278177dd23b607dce369ccafb3f61b41638eea2c9b399
 +F src/bitvec.c 1a048c91b2fbccbbc32dcefa757f93216c0f518ed2bc0b4db39947264479ad06
  F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
 -F src/btree.c 2c0c8589ca2eec70b52d2606bf71e805822821cf8ebcde7270129e2287162fb2
 -F src/btree.h e823c46d87f63d904d735a24b76146d19f51f04445ea561f71cc3382fd1307f0
 -F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
 -F src/build.c 611e07299d72ff04bbcb9e7109183467e30925d203c3e121ef9bb3cf6876289b
 -F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
 +F src/btree.c 29f1051f14715bad3abd99df384e1f0ef2301121d08c2c87323d5d63f492a0b5
 +F src/btree.h dcda10d5a5d29690dc2739b8d4d416d136760ab1dbe88a2dd417855e1775e37a
 +F src/btreeInt.h c3b8750a8dd8bc9a38840be463e7d23899b9da08276fa442e2bb8efd1052bc48
 +F src/build.c d7250a0005ce3d607e3df20743d7c3d48988fdf20296811f96d4c549fca891b5
 +F src/callback.c bd1ecfce052f6a5854497b16e6cae4f39f314d62fe43bd4cdaa452ab93623f3c
- F src/carray.c a6f26cb349ca700d706c0e76d5b2895d76e2a1c392a2b909cf543a0dd4d4d047 w ext/misc/carray.c
+ F src/carray.c a6f26cb349ca700d706c0e76d5b2895d76e2a1c392a2b909cf543a0dd4d4d047
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/date.c e19e0cfff9a41bfdd884c655755f6f00bca4c1a22272b56e0dd6667b7ea893a2
  F src/dbpage.c c9ea81c11727f27e02874611e92773e68e2a90a875ef2404b084564c235fd91f
@@@ -728,27 -722,27 +728,27 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
  F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
- F src/os_unix.c 863a7426cda7b239735eb9d749b2ea0e9d3fc075ee1020085be85371535e0334
 -F src/os_unix.c d4fd1c9bd8948c07071fbf5e4ef827f249b9075f31d3706ecc6481ed4e0ba46d
++F src/os_unix.c a4a89ba8e2c0bb25ba45165f322aa45117a5be56e8dfc63b09f0bb871035e053
  F src/os_win.c 27617f334168644b542c9d58ac6e5f051b318136273e78d243384b4eca2df6b3
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 -F src/pager.c 4dd3d1ca38b88dc46475be26c50a2866218d84ce7c0980ab8656e116a5445a99
 -F src/pager.h fc0c95d27f2aefffcb39b4373b3557e89e1b4b9a36b183cc04d6f22002bf0ad2
 -F src/parse.y 619c3e92a54686c5e47923688c4b9bf7ec534a4690db5677acc28b299c403250
 +F src/pager.c a8b08e262e43251a32e5eb20666177994d6b5a8b80eaa69c1e4b2328bf134f33
 +F src/pager.h dd6ade22dd303a8ca6c34f1ff0f299add7191c1bff65f0289b7fd7c3460f9551
 +F src/parse.y f97f2ed8f0d46a22530aabaac9e2915941f255adcac67b420cd77c384d09a1d0
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 -F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 +F src/pcache1.c 69b3a3e00e56dd03749af545084f4c823690400e8b12fcefba948f8fd975b84a
  F src/pragma.c ab340f5e412cb46da58d159fd57a70d6696578b5b39664fb44064279b4d20a33
  F src/prepare.c 2af0b5c1ec787c8eebd21baa9d79caf4a4dc3a18e76ce2edbf2027d706bca37a
  F src/printf.c 7297c2aeed4d90d80c5ba82920d9e57b7bfad04b3466be1d7e042db382fe296e
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
  F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
 +F src/select.c baf48b38fea6765887330cd09d5b52d573b782e7f4b565b890a1be5591f0e12e
- F src/shell.c.in e58b0cecf2579c0115253e9c02a44b54fbadf77f4f33b43cfaa48a8274c9aa01
+ F src/shell.c.in ce9953719b1e544e71cc47f3b9b699440e4f441418506c0913484c58a27b36b6
 -F src/sqlite.h.in f7944026ee89ea348f89aec56372d6d25b6cafc1d89df741278d6917e86326a3
 +F src/sqlite.h.in 756af67e912658e177259769826bd527821723322215a4fc56edb75ea6870fd2
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52
 -F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59aa
 +F src/sqliteInt.h 3abba32334160df50e29079ca1c668b8ed733abeb2422ab63e68d997f234caed
  F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
  F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -809,8 -803,8 +809,8 @@@ F src/update.c e1a8b1876e6f2a1824a6b9f1
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 -F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789
 -F src/vdbe.c 71b416b82685bc210ef0dad9731722b2da2826a2ebbecce7ecd05528886a7e59
 +F src/vacuum.c 9e6ca9779ed3924fa6590a5a5ffe4d9233cead10144bbc285da44ff5519f7ec4
- F src/vdbe.c 34ff2e63552d0334c4d14b9d4d11dc5152d70b978544c38f8f6af8e1ab4d5e88
++F src/vdbe.c 427dd374b2f545f317faaff61a1f37f744fe8ca8e32f946841c3a29fefafb932
  F src/vdbe.h be33bd7b17f2ec92939642416030491508c51071f6c14e27cd195983fec56b63
  F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e
  F src/vdbeapi.c 869a0da5d855495055f4d35c6ada582f64ce995ce14b26ff9d336274d497266c
@@@ -2208,8 -2185,8 +2208,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 a7fbbfc7dd2b8b0ac18b17a9a57b834c0d249af1642426362b8501e87c42a7bd 2ae29242aa04e25f5bd47517c68d1f70c2b2173682730055f8ca8d9581c9bc23
- R 295a32663df9b0368d2e6b43136a0990
 -P 2ae29242aa04e25f5bd47517c68d1f70c2b2173682730055f8ca8d9581c9bc23 724f2299f206cc9e7f830f984c50a8fc4ac1c17210d71d9affe657b45252b060
 -R 3564ef388ca7ffcf9a1b3b5c962c8ba0
++P 2563e274ee18a267beb521119170543dc3949a1239d781884c4a5fab61d07d3c c510597295f20d343845615c4a5f8d37a4c0f508b9d8a6b6f9c7dc3a7f5980ea
++R bd50d18d4582fdbd8bfdcb9469b11248
  U drh
- Z 4575e8bc7aafcb07c57d47c84b2fecb0
 -Z bd8134d8c9b52873d0efeecda0dad8d9
++Z d294edc798d8779ed6abd22187343ae3
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d3966663f6,6cb62ae9b5..4e8136afa2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2563e274ee18a267beb521119170543dc3949a1239d781884c4a5fab61d07d3c
 -c510597295f20d343845615c4a5f8d37a4c0f508b9d8a6b6f9c7dc3a7f5980ea
++6639bed2bb1ab81dd4f52eec84045c5e74291db84671ae768029d6c6c54d60ee