From: drh <>
Date: Wed, 8 Apr 2026 19:37:42 +0000 (+0000)
Subject: Merge the latest trunk fixes into the bedrock branch via wal2.
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bcf501a91dca61b47ca5f16f493e28170fa5ecbe;p=thirdparty%2Fsqlite.git

Merge the latest trunk fixes into the bedrock branch via wal2.

FossilOrigin-Name: 99901eae6432a53e93eb1664751fea0de9edfaeeb68e5034277805c438f33aa1
---

bcf501a91dca61b47ca5f16f493e28170fa5ecbe
diff --cc manifest
index 6aebe7661f,94861fd658..4ceecbdcbd
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\senhancements\sinto\sbedrock\svia\swal2
- D 2026-04-02T12:12:33.516
 -C Merge\sthe\slatest\strunk\sinto\sthe\swal2\sbranch.
 -D 2026-04-08T19:28:10.533
++C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\sbedrock\sbranch\svia\swal2.
++D 2026-04-08T19:37:42.214
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -577,11 -573,9 +577,11 @@@ F ext/session/sessionrowid.test 85187c2
  F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
  F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
 -F ext/session/sqlite3session.c 165a880952fdc1e6397cb05e7d337ff5174596078c1fb0abd4f9933141c565e3
 -F ext/session/sqlite3session.h 063e7bf7be2fff874456f452a224b5b3013b25682d108933b0351c93a1279b9c
 -F ext/session/test_session.c 21b820d8b8007587fa32721e4cba104765f796345656fd277e94c58ecba9c34d
 +F ext/session/sqlite3changebatch.c d488b42d8fd49fb013a1e9c4535232680dabeb28ae8f9421b65ea0ccc3b430f7
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
 +F ext/session/sqlite3session.c 485e61ac04fa60163e8a50e5df7d6525c7ff7aa60b4b44b50ec5a5793fec5b3e
 +F ext/session/sqlite3session.h 1d4d0d0d7b2de3dbf3221ecf56e460a955fd256ecc5e5b7cbe0ae870255faefb
- F ext/session/test_session.c 34212e0239bf0e88f07291c3bdab8420c85ea7c10a589f9800881be3e9c4336e
++F ext/session/test_session.c de684b27301ca48063b1a7b74060cee834b90722f449977216971593de5296d5
  F ext/wasm/GNUmakefile 68c750f173106d9d63f12c1edf1256c6f4bad9894b155da5db64322f4912de4b
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
  F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259
@@@ -727,27 -721,27 +727,27 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c e7d96727db5b67e39d590a68cc61c86daf4c093c36c011a09ebfb521182ec28d
  F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
 -F src/os_unix.c fa5e09b4df35ad845440cad67b86908cfe1fd4c28c51915f82e23633d1992bf4
 +F src/os_unix.c 26448dcc94baa96f2e20e088641cb069c99e100e752628b390254f2f50cb72fa
  F src/os_win.c 0d553b6e8b92c8eb85e7f1b4a8036fe8638c8b32c9ad8d9d72a861c10f81b4c5
  F src/os_win.h 5e168adf482484327195d10f9c3bce3520f598e04e07ffe62c9c5a8067c1037b
 -F src/pager.c ac55710d5c1ffcc650677d4596305ff9470ba9191266ac015e4eb1f0a5a6871d
 -F src/pager.h fc0c95d27f2aefffcb39b4373b3557e89e1b4b9a36b183cc04d6f22002bf0ad2
 -F src/parse.y 3b784d6083380a950e3b1b32ce5ddd303e8c7c209d8ab788df2c62aaf9ee8eb3
 +F src/pager.c 3eb91d6767b280553f72f43c35e270d6f3a83caaea59e3b050bebb19ae4169a7
 +F src/pager.h dd6ade22dd303a8ca6c34f1ff0f299add7191c1bff65f0289b7fd7c3460f9551
 +F src/parse.y ed14fa473eaa60ec94b9cb970908e708d2b190f41c8042a001b20788b1c71ef5
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 092b758d2c5e4dabb30eae46d8dfad77c0f70b16bf3ff1943f7a232b0fe0d4ba
 -F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 +F src/pcache1.c 69b3a3e00e56dd03749af545084f4c823690400e8b12fcefba948f8fd975b84a
  F src/pragma.c 06feccc280ac006b084e5a03a85466aba46aa75bdd7b3cca5a7343e46a0b8875
  F src/prepare.c f6a6e28a281bd1d1da12f47d370a81af46159b40f73bf7fa0b276b664f9c8b7d
- F src/printf.c 9abec48ffb0fc1aac72a461e2ca456b5284a39c84cddc932c86822311e059882
+ F src/printf.c 41fb76fcb5ed7e16aaddc659d3b23891abebea45549fe125fc2e6ec380cc7175
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
  F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
 +F src/select.c 5c5b5bd015202400779d4b5dcfe96ed15b7312e169ed549182f74c25ac9e4207
- F src/shell.c.in 91ee40ec3f75192362cbaa0ad85316140b8dde00a184113d73a837fb6173dbcc
- F src/sqlite.h.in 773fd6560550bc57d4c4bbd3deb0a0c3490a2b30f10b97279782859228afec5b
+ F src/shell.c.in a3288615aba1b375f7dca9801874c806e8d0d047dfe4e9253a944f4b47c7459e
 -F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8
++F src/sqlite.h.in ec58c44813ce4d31776cfadb03fead79011560f9d6b4ce6f32c286e76e1bb05c
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
 -F src/sqliteInt.h bc1cbc0c23dba35b324ae85a7dbb5fb182321bbd30857fb21f3d0cba049001a5
 +F src/sqliteInt.h f3bcf76343fa87b24a142273a9232d3715d7b2b5131211969acbbac205fbbb7f
  F src/sqliteLimit.h c70656b67ab5b96741a8f1c812bdd80c81f2b1c1e443d0cc3ea8c33bb1f1a092
  F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -821,8 -815,8 +821,8 @@@ F src/vdbetrace.c 49e689f751505839742f4
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 5437ce986db2f70e639ce8a3fe68dcdfe64b0f1abb14eaebecdabd5e0766cc68
  F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab
- F src/wal.c d2a533795f209c107a6d197c1016301414d23620fb3e0d769eb1ecf127128775
 -F src/wal.c 6fdaac2cb9a53f47052138a41ed7d102c701c6f98fba87826511c47ad31bf563
 -F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
++F src/wal.c b770732943dc5ac0176b6b7d18a66c33f94267859deefee683e120e141eda486
 +F src/wal.h 4f25678500c97bf59c627fa4ed8b9fc4f5bbb958b2e26cc638e42d13509848c3
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
  F src/where.c bffca5e4ef20d0bfbdc24f1dc13fd3f955284225a8ad25a4454635f6be39aad0
  F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da
@@@ -2234,8 -2211,8 +2234,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 2d3e457eff9da48d718669a2b09aebbf575b572d625f3b26c649fa63cad3fd82 5d7551a30b8547c17cfff901709e27835c2ebaa1dbbd4df4d0b252f216f2f8f3
- R 17448836d76947c382e8917d03ad1a44
 -P 5d7551a30b8547c17cfff901709e27835c2ebaa1dbbd4df4d0b252f216f2f8f3 be891a137af15897691250324e4d3d9c96f0c5fb414bca27d0c3bfdd3012a8a2
 -R 6618b77d2a6e3bf805590cb80ce54160
++P 3749b564c36933027d149f3c3e75323a0d99466321433eff1467c266571e3297 67a72256f8d23f86d130242b4b69553232fe5ea38166e87793b349f464076f3d
++R b22d60762124b28a8d31c5a3f833995c
  U drh
- Z 95ce981040a9fac0126b2860ac61f327
 -Z de1b32b39cf188a58628419631f0affc
++Z eaaf2cd6096c5c50f29bad19a65d02cb
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index eeb10ba1c3,65f5715d7c..236291b560
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3749b564c36933027d149f3c3e75323a0d99466321433eff1467c266571e3297
 -67a72256f8d23f86d130242b4b69553232fe5ea38166e87793b349f464076f3d
++99901eae6432a53e93eb1664751fea0de9edfaeeb68e5034277805c438f33aa1