From: drh <>
Date: Fri, 3 Jan 2025 15:12:00 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccb5519a54ab1f992bb970edb989083856637ad8;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the wal2 branch.

FossilOrigin-Name: 0992237cd432a9339d1c1a0562ab8007458c15d94b347f4092d1f62f78ae7aed
---

ccb5519a54ab1f992bb970edb989083856637ad8
diff --cc manifest
index 77c5a06e93,dbe9f57581..6a0e1c72b9
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Sync\swal2\swith\strunk.
- D 2024-12-16T18:16:09.524
 -C Add\scomment\sto\sthe\scolumnIsGoodIndexCandidate()\sroutine\sto\srecord\sthe\sresults\nof\sa\sfailed\sexperiment.\s\sNo\schanges\sto\scode.
 -D 2025-01-03T11:51:50.103
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
++D 2025-01-03T15:12:00.085
  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 8422f172e21484feeb1fa8b35d54c4924901c078bbabb0fb0d0de9bd9f46075b
 -F Makefile.msc eed0c40c365d100f3329e8fb7d0e18bad09a6f0c026aa1e4dc7f88270378929d
++F Makefile.msc 8039a7e1e28329adf0c2516396f7ecdae837d64a0be501d7332b1d4ac6b95539
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -701,7 -699,7 +701,7 @@@ F ext/wasm/tests/opfs/concurrency/test.
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk c18c6cdb89df91a32cce4e3e1adf40ad2398c345eabf59bc033a3f35263e06c8
 -F main.mk fde6ef9167ab1972f6273c0cc06a7d2d776f562d06f44f4987868335910f3803
++F main.mk e84f0c8a4c070c6feb4d820a72dbc62f297db50cf77795650902ddf4ffe6fbf5
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -724,9 -722,9 +724,9 @@@ F src/btreeInt.h 98aadb6dcb77b012cab257
  F src/build.c c6b09342d870a509529244ed8e19b4175a261f2e3163c199241d69e1d8a57607
  F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b
 +F src/ctime.c dbd2d51fa2874ad54c673cb71b1f5bbd0df1b8b47b34f31d105f42500680a89a
  F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
- F src/dbpage.c 6c52074b0edb914d526c85541ca0f1fd23822b5dac39b6ee9b7f375d9fa592e9
+ F src/dbpage.c e90410e5d4c0217dfddc4184a81e38ec4903c25d4ec0f201060a0e54e7c2099f
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
  F src/expr.c 3329173aacc6c37da3971b6253827799b32e301673be00126df8271bf018e15f
@@@ -852,7 -850,7 +852,7 @@@ F src/vdbe.c b2d91fce8b2d357b69d3c4aa9d
  F src/vdbe.h 9676348d342bd04e21e384c63b57224171ce84fac77853357334ef94c4d33cf4
  F src/vdbeInt.h bf294a0c8fc4cc80779e74b04b8bd82c6e1197b3137cefe0b16cdf002fc7dfd6
  F src/vdbeapi.c 38c252a202d70b56cfb734460bc888ddbd581afec1a10cd4d6c894c9e0b5baea
- F src/vdbeaux.c b0364770c5494642a69ce1d269f0fdd17acc46057b175aa50be345bab51227f1
 -F src/vdbeaux.c 5fcbc642a3d3d88c5ea15cadf2c8b8e4e067cb9ff374beb1875c9d209001299e
++F src/vdbeaux.c 29c09a635c6790af7b58618f3a8e67ad90c79d6da57ac11b320f7aacfc3616d2
  F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
  F src/vdbemem.c df568ef0187e4be2788c35174f6d9b8566ab9475f9aff2d73907ed05aa5684b2
  F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@@ -860,10 -858,10 +860,10 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997
 -F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 +F src/wal.c 3ff22607c591f208bf81b5ea2160e5715d12bbb5b762394f79b2bd13d3f7568b
 +F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2
+ F src/where.c d519bc93b4a05928f10ba4925b1afc77cbd71c1b1b5148583ab4868925c639fb
  F src/whereInt.h 1e36ec50392f7cc3d93d1152d4338064cd522b87156a0739388b7e273735f0ca
  F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
  F src/whereexpr.c 0f93a29cabd3a338d09a1f5c6770620a1ac51ec1157f3229502a7e7767c60b6f
@@@ -2152,9 -2138,10 +2152,10 @@@ F tool/loadfts.c c3c64e4d5e90e8ba411592
  F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
  F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
+ F tool/mkamalzip.tcl 8a1b21fb6a7f990eb9625e08daa2dd0e03cb551bccc69ccd1cdd5bd975e8177a
  F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
  F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x
 -F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x
 +F tool/mkctimec.tcl e78bd291adb921d76565860605b1a9666ea74fb72d5fd671f737aa2faa89bfa5 x
  F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
  F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@@ -2216,8 -2204,8 +2218,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 e4406a6e2660f1f42614d0034d024cc206109ac71e9f8b289aeed2eba20be8e9 8f725472b0fe62359a4cd3237b43d7b834e042d8ce425abde06e3ed6c62dbafa
- R a440747468661c427837f99ee412b9ae
 -P 1291b013a8c93e7001fe25783bc98d12f5f7c341d1f728e6852632e18a38af58
 -R 0507e66ed59bfa5a55bc14583a9d765f
++P caadbe0c0c3dee411140df7d13f6e8275f9c13562bb384be38520ee2305c32bd 9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++R 7efd558b010ea28732e35e339c0d0a4f
  U drh
- Z fa1fbe4ac13afbbbd055627cdf93d6dd
 -Z 3304d535a779543ccf066c65753e6b08
++Z d5f5b3e38d0f2f407fdbdbb0c538be8f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 97514e3705,d506d57c15..640e66fb76
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- caadbe0c0c3dee411140df7d13f6e8275f9c13562bb384be38520ee2305c32bd
 -9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++0992237cd432a9339d1c1a0562ab8007458c15d94b347f4092d1f62f78ae7aed