Merge latest changes to wal2 into this branch.

FossilOrigin-Name: 7cbab6ea6c0fc9ab70cb6816c3534c49c6e4096d7870ea35275977cc8ced9753

diff --cc ext/fts5/fts5_main.c
Simple merge

diff --cc ext/session/sqlite3session.c
Simple merge

diff --cc ext/session/sqlite3session.h
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 183edd61750d6f03fda5ae41cc5034e5a6957fa7,67d0be2bb76015c5f69b9427474ebe68f31493bf..0ceac81d1850cc362603cd09eeb01c25936ec0d0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\schanges\sfrom\sthe\swal2\sbranch\sinto\sthe\sbedrock\sbranch.
- D 2025-09-04T16:26:49.514
 -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
 -D 2025-09-19T17:53:53.339
++C Merge\slatest\schanges\sto\swal2\sinto\sthis\sbranch.
++D 2025-09-19T18:01:33.750
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -113,10 -112,10 +113,10 @@@ F ext/fts5/fts5Int.h 4bba2aeadbbd737867
  F ext/fts5/fts5_aux.c da4a7a9a11ec15c6df0699d908915a209bcde48f0b04101461316b59f71abffb
  F ext/fts5/fts5_buffer.c f1e6d0324d7c55329d340673befc26681a372a4d36086caa8d1ec7d7c53066c7
  F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8
- F ext/fts5/fts5_expr.c be9e5f7f11d87e7bd3680832c93c13050fe351994b5052b0215c2ef40312c23a
+ F ext/fts5/fts5_expr.c b8c32da1127bafaf10d6b4768b0dcb92285798524bed2d87a8686f99a8e8d259
  F ext/fts5/fts5_hash.c a6266cedd801ab7964fa9e74ebcdda6d30ec6a96107fa24148ec6b7b5b80f6e0
  F ext/fts5/fts5_index.c 2a1be0fb3c1b185f84b08b8032ba332c82defa182ff125833c0fecba0a4938b0
- F ext/fts5/fts5_main.c 52e6b6fda96d6823de33c0fb0760562860b5891bf751fcf22d83421c7b0edb14
 -F ext/fts5/fts5_main.c e1e5a0ce1bceb5d47ed4cc83ed4f45795035ae300343bcddd0a5785a6862053a
++F ext/fts5/fts5_main.c 859432f17ef827668bb04ef8e988bbaf3f4a197f0b5d3b484f572ab7c6d72eaf
  F ext/fts5/fts5_storage.c 19bc7c4cbe1e6a2dd9849ef7d84b5ca1fcbf194cefc3e386b901e00e08bf05c2
  F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329
  F ext/fts5/fts5_test_mi.c 4308d5658cb1f5eee5998dcbaac7d5bdf7a2ef43c8192ca6e0c843f856ccee26
@@@ -579,13 -576,11 +580,13 @@@ 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 9cd47bfefb23c114b7a5d9ee5822d941398902f30516bf0ddfb131d94f8bb840
 -F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
 -F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
 +F ext/session/sqlite3changebatch.c d488b42d8fd49fb013a1e9c4535232680dabeb28ae8f9421b65ea0ccc3b430f7
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c 8fc3fc3c48d3a8d693d11d10886d63f8cb34e96937ce2975203c94294a2f3046
- F ext/session/sqlite3session.h edbcaf0d39a9ae838a81cccb3e41ff424fa70b6d5434214ac3119b7d3d5bbd0d
++F ext/session/sqlite3session.c 37afe9c57d9f976f2ff67e007e57c978b1cf84553dcaafdd7251f5d7a90adee2
++F ext/session/sqlite3session.h 120bd92f96f78d3b79848feb8c539350a15da8e9803226750d337f9a943dd86b
 +F ext/session/test_session.c eea930cdd55dbf960a2f6b35d7050d118a44bbe9bca1e66c6793909f02783404
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
- F ext/wasm/GNUmakefile 35e730a01b32481f5483ea5bd72c3d4609e25f34cb5aab9f85eb3eba6f0c4935
+ F ext/wasm/GNUmakefile 89e18d6e4783841a5236930b988df27e02317b3ac440a1a5571de4a79df3c8e7
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
  F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -673,7 -668,7 +674,7 @@@ F ext/wasm/tests/opfs/sahpool/sahpool-p
  F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
  F ext/wasm/wasmfs.make 411dd94b40406572caddf88392a1ccc4deed0f88d260516e59ca6e0c887ee861
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 214782f3249b715e397ba1b6a7d5c788dc2c8932fdd352d9bf3fee720096b78d
 -F main.mk d3fcd95e131df3bb0cc52cadb016634fa28b91661866573eea4d9aed1a503509
++F main.mk 100b83c4f31a75b50a326fa513ef9cfc812686a602b740fa85198ff5c329ed2a
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -688,16 -683,16 +689,16 @@@ 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 9c95d5bd5969be8962bcbebe651a5b664f92fc5d6c9e8bf0d9e6e008ad3c99d3
 -F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
 +F src/btree.c 29f1051f14715bad3abd99df384e1f0ef2301121d08c2c87323d5d63f492a0b5
 +F src/btree.h dcda10d5a5d29690dc2739b8d4d416d136760ab1dbe88a2dd417855e1775e37a
 +F src/btreeInt.h c3b8750a8dd8bc9a38840be463e7d23899b9da08276fa442e2bb8efd1052bc48
- F src/build.c 2d6a61557730bf8368f64be1e4117a15354683267a9b3c124485d9a23cc069bc
++F src/build.c 7129f6eee5176abec7ef1d392b6a113d80cf92e6135e3b8de9c3b55245dd3723
 +F src/callback.c bd1ecfce052f6a5854497b16e6cae4f39f314d62fe43bd4cdaa452ab93623f3c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/date.c 9db4d604e699a73e10b8e85a44db074a1f04c0591a77e2abfd77703f50dce1e9
- F src/dbpage.c a6f7f16fde5656686b05705d41a4cb339db8262dc4d11699b7b40ba503db624e
+ F src/date.c b6f92001f4b1f73f21774927488661d28f4dac9cd9701ed96486d96b44f5b058
+ F src/dbpage.c 081c59d84f187aa0eb48d98faf9578a00bde360f68438d646a86b618653d2479
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
  F src/expr.c 0cad74107489c688449d7fec47b605c61a75c6da707031dfc4c76d1ac75667b3
@@@ -712,8 -707,8 +713,8 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c dfd311b0ac2d4f6359e62013db67799757f4d2cc56cca5c10f4888acfbbfa3fd
  F src/json.c cb87977b1ee25ee7d27505d65a9261b687395bf895342c8ba566b7c01aee2047
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c d7edd8e671237539d795d30daaf888908a2c82e99bade4c78f3be021e8b7d655
- F src/main.c 5a9f2b05987f0f638af66773e49ce113a53d632c9da0049cd283e552795a868b
+ F src/loadext.c 3326993a09553c6b38cc52d4f9cc2e47dcfc8736ffd853fcb0cb49bc9e3d523c
 -F src/main.c 8faccfa7dc8a470ac57f060948ff703da1f2dbedcd4cebc0a21caeb7facf7eef
++F src/main.c fee5464a5493bd8f6ad0a411b442e3d487c05996e9daf01e3f553ec567c87c7d
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -732,29 -727,29 +733,29 @@@ F src/notify.c 57c2d1a2805d6dee32acd5d2
  F src/os.c 509452169d5ea739723e213b8e2481cf0e587f0e88579a912d200db5269f5f6d
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
- F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
+ F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c 2f9897845490c3f6b2c4e5201c10572645f26cac78f809e53196e75673945805
 -F src/os_unix.c b3da55bc4bb214b2bfb1e430b10e9d3ebcf6b11741921ab044c9b9539c8fcc4f
++F src/os_unix.c fde6f7cc7ad8c3d25f8f6ca59ddac74759179aa28cc287aea867bb1eefd07082
  F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
- F src/pager.c b1494dfd4cddcbe599e963beb0f8715f9587e1fce1d7a8df55d5bce4bb5b3466
 -F src/pager.c 18c69cc25c3f87459e1ac67ceef48cf04d609b677edcdb64f182bbeb23cfd088
 -F src/pager.h fc0c95d27f2aefffcb39b4373b3557e89e1b4b9a36b183cc04d6f22002bf0ad2
 -F src/parse.y 619c3e92a54686c5e47923688c4b9bf7ec534a4690db5677acc28b299c403250
++F src/pager.c 3bb5f43cc6656c32c04d5e3f611e1f3c839a92f855d08e8e0358d7cf45be0565
 +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 c6dbc66743689d2a7a8073a49ee0440df939fca8e1c5ab38c8ea5a0d8c0a2a85
+ F src/pragma.c ab340f5e412cb46da58d159fd57a70d6696578b5b39664fb44064279b4d20a33
  F src/prepare.c 2af0b5c1ec787c8eebd21baa9d79caf4a4dc3a18e76ce2edbf2027d706bca37a
  F src/printf.c 5f0c957af9699e849d786e8fbaa3baab648ca5612230dc17916434c14bc8698f
 -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 51c8452b3e6b9a0dfa3df853dd16f147e5e4ae2002deb775cf8a2fccf01c3c6c
- F src/sqlite.h.in c54a8cf81779c5b4cae2abb00ee867391b77c8562c56461a0aad4866f7964a56
+ F src/shell.c.in 4fe89ea95c2ea05b1fc98ee8e27aa03dd080ae12dfe201334cc7f338f4ece7e2
 -F src/sqlite.h.in 5732519a2acb09066032ceac21f25996eb3f28f807a4468e30633c7c70faae1c
++F src/sqlite.h.in e74339526325568e189489bdc0d63e98269884cb99581cd07223dcb90585148e
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
- F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
- F src/sqliteInt.h 5843a779aedc09eb4a3d4f7d435adbadfb53072639e4ef41104df592f322c9cb
+ F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
 -F src/sqliteInt.h 5f6db0908f0e1d5cbae56955cc119bf85e92f3bdd1bcffe22190d6775efac7b4
++F src/sqliteInt.h c973a719fd7ac1fc22f3522fd6adc5079132fce012af50b12866667dc3b25ee6
  F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -815,8 -810,8 +816,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 22c40378276de8a811b4d39c983d345da7792070c5173b679ebb53b30392572b
 +F src/vacuum.c 9e6ca9779ed3924fa6590a5a5ffe4d9233cead10144bbc285da44ff5519f7ec4
- F src/vdbe.c 7a3d763b1706dea19d815535998cc5a063d6b77ec5a44670738e95c220256ff5
++F src/vdbe.c 6ea46d6aa01f2e63a87f955f550f6ebecbf46058fb7f3abca65145637ebc09c0
  F src/vdbe.h ea1f1b52f0efe422f80d88da3c57e4eadc72856e29a22f1ff08e502ec6ba5f08
  F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e
  F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df
@@@ -827,11 -822,11 +828,11 @@@ F src/vdbesort.c cb6f472e83ca12c46aa7de
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
- F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 8ed0a6b2acbfd67bbdf17710c8787555c2b98f26caba8922f25f8590a704946d
+ F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab
 -F src/wal.c ba928786bf0b43c7d522148b6db24f829e8cdb2d79fddd19c78315de60ba48eb
 -F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
++F src/wal.c 45f107fc800f64dbc5ea794efcb451b7eb5f29db5cd812c0597848bcc0ee8318
 +F src/wal.h 8d02ab8c2a93a941f5898eb3345bf711c1d3f8f86f4be8d5428fb6c074962d8a
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c f2f075bd17065922235632feb368efe92a7f03d42797eb575267574fbf6d4218
+ F src/where.c 8188fac428a8d8e50e133563b59a2be3108fb6723004829c8297c4648784daee
  F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da
  F src/wherecode.c 71c5c6804b7f882dec8ec858758accae02fcfca13df3cc720f1f258e663ec7c5
  F src/whereexpr.c 403a44eeec1a0f0914fccc6a59376b6924bc00ef6728fe6ffce4cf3051b320fc
@@@ -2012,6 -1993,7 +2014,7 @@@ F test/wal_common.tcl 204d1721ac13c5e0c
  F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
  F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
  F test/walblock.test 6bb472e82730e7e4e81395e907a01d8cfc2bd9e1f01f8a9184ca572e2955a4bf
 -F test/walckptnoop.test a66e79e9afd5b4b46c65bfc77e57ed37259cedef91e4bd60ae7f64ff9f2e1962
++F test/walckptnoop.test b44f18370476faac8511f97e99c737dd611416fa64ecd63da9b5b59783acabcb
  F test/walcksum.test 50e204500eed9c691b6045e467bb2923f49aa93d8adf315e2be135fdb202c1c2
  F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
  F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
@@@ -2209,8 -2189,8 +2212,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 ba2174bdca7d1d1aadf0a4de1e01aeba3d95b6656cb9ecdff88b00cfbef8f3a9 8b881fd828d6d1cc4d42064e4c2b5fa47de473de196a830c35b18d2becfba61b
- R b58de5559edb5f8fe8d5549a1b1a8a4d
- U stephan
- Z 0b2b1d7e0fe9ff0fe61e6f529a0e48ff
 -P 8b881fd828d6d1cc4d42064e4c2b5fa47de473de196a830c35b18d2becfba61b a4430d262b3e129d7f00be1661af563907d7b2e98560a9847cd399129f91247b
 -R 173b52cea746c727297e8f918580aa21
++P 21e4744de2cf22a6d65ed68e943a385dac0b58aa46c01db07e9abefea9463190 df9475756b3565313cdc68bdfa58c54f0a1cf3eeefb4f4fa7bb88588980dda2c
++R dbf2dc3be44ac70d9797b9519667c250
+ U dan
 -Z ba6e7711d62f5b755d1b0204cf08b48d
++Z e9b772ed67cd3eb91bf4c309e2c01ef1
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 0cd2fda8aae66435ad125e752d3f065522725051,60b6756933a0076edf61e8cb288fc21240b0f03b..9965ba9e242e11e4cfae5a7562e1b14e15b093b5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 21e4744de2cf22a6d65ed68e943a385dac0b58aa46c01db07e9abefea9463190
 -df9475756b3565313cdc68bdfa58c54f0a1cf3eeefb4f4fa7bb88588980dda2c
++7cbab6ea6c0fc9ab70cb6816c3534c49c6e4096d7870ea35275977cc8ced9753

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/walckptnoop.test
index 0000000000000000000000000000000000000000,f93c4c238f32e8482349e6825ef18287d7cff7e3..ec5933fdf1bf4a6067b16a9964c91f24c29e97d5
mode 000000,100644..100644
--- /dev/null
--- 2/test/walckptnoop.test
+++ b/test/walckptnoop.test
@@@ -1,0 -1,90 +1,90 @@@
 -set testprefix walckpotnoop
+ # 2025 September 5
+ #
+ # The author disclaims copyright to this source code.  In place of
+ # a legal notice, here is a blessing:
+ #
+ #    May you do good and not evil.
+ #    May you find forgiveness for yourself and forgive others.
+ #    May you share freely, never taking more than you give.
+ #
+ #***********************************************************************
+ # This file implements regression tests for SQLite library.  The
+ # focus of this file is testing the operation of the library in
+ # "PRAGMA wal_checkpoint = noop" mode.
+ #
+ 
+ set testdir [file dirname $argv0]
+ source $testdir/tester.tcl
+ source $testdir/lock_common.tcl
+ source $testdir/malloc_common.tcl
+ source $testdir/wal_common.tcl
+ 
 -} {0 320 0}
++set testprefix walckptnoop
+ 
+ ifcapable !wal {finish_test ; return }
+ 
+ do_execsql_test 1.0 {
+   PRAGMA page_size=1024;
+   PRAGMA auto_vacuum=NONE;
+   PRAGMA secure_delete=OFF;
+   VACUUM;
+   CREATE TABLE t1(x INTEGER PRIMARY KEY, y TEXT);
+   CREATE INDEX i1 ON t1(y);
+   PRAGMA journal_mode = wal;
+ 
+   WITH s(i) AS (
+     SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1000
+   )
+   INSERT INTO t1 SELECT NULL, hex(randomblob(64)) FROM s;
+ } {0 wal}
+ 
+ do_execsql_test 1.1 {
+   PRAGMA wal_checkpoint = noop;
 -} {0 320 0}
++} {0 314 0}
+ do_execsql_test 1.2 {
+   PRAGMA wal_checkpoint = noop;
 -} {0 320 320}
++} {0 314 0}
+ do_execsql_test 1.3 {
+   PRAGMA wal_checkpoint = passive;
 -} {0 320 320}
++} {0 314 314}
+ do_execsql_test 1.4 {
+   PRAGMA wal_checkpoint = noop;
 -} {0 320 0}
++} {0 314 314}
+ 
+ db_save_and_close
+ db_restore_and_reopen
+ do_execsql_test 1.5 {
+   PRAGMA wal_checkpoint = noop;
++} {0 314 0}
+ 
+ db close
+ sqlite3 db test.db
+ db eval {
+   PRAGMA auto_vacuum=NONE;
+   PRAGMA secure_delete=OFF;
+ }
+ do_execsql_test 1.6 {
+   PRAGMA wal_checkpoint = noop;
+ } {0 0 0}
+ 
+ do_catchsql_test 1.7 {
+   BEGIN;
+     DELETE FROM t1;
+     PRAGMA wal_checkpoint = noop;
+ } {1 {database table is locked}}
+ 
+ do_catchsql_test 1.8 {
+   COMMIT;
+   PRAGMA wal_checkpoint = noop;
+ } {0 {0 5 0}}
+ 
+ explain_i {
+   PRAGMA wal_checkpoint = noop;
+ }
+ 
+ do_execsql_test 1.9 {
+   PRAGMA journal_mode = delete;
+   PRAGMA wal_checkpoint = noop;
+ } {delete 0 -1 -1}
+ 
+ finish_test