Merge latest changes from the wal2 branch into the bedrock branch.

FossilOrigin-Name: 21e4744de2cf22a6d65ed68e943a385dac0b58aa46c01db07e9abefea9463190

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 748d0ceadb28d7e6dc5ff9a8d1d0991c12d043b2,441557b9989799af602111bb90a0764554c5065e..183edd61750d6f03fda5ae41cc5034e5a6957fa7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sof\sthe\strunk\senchancements\sinto\sthe\sbedrock\sbranch.
- D 2025-07-17T15:31:16.413
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
 -D 2025-09-04T16:02:24.827
++C Merge\slatest\schanges\sfrom\sthe\swal2\sbranch\sinto\sthe\sbedrock\sbranch.
++D 2025-09-04T16:26:49.514
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -115,8 -114,8 +115,8 @@@ F ext/fts5/fts5_buffer.c f1e6d0324d7c55
  F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8
  F ext/fts5/fts5_expr.c be9e5f7f11d87e7bd3680832c93c13050fe351994b5052b0215c2ef40312c23a
  F ext/fts5/fts5_hash.c a6266cedd801ab7964fa9e74ebcdda6d30ec6a96107fa24148ec6b7b5b80f6e0
- F ext/fts5/fts5_index.c c1ca58fbc4b323d2153ab42ed787d78d5beb64f5710d0dcb83d94c6ddd184492
+ F ext/fts5/fts5_index.c 2a1be0fb3c1b185f84b08b8032ba332c82defa182ff125833c0fecba0a4938b0
 -F ext/fts5/fts5_main.c e558225168845dc708abeb2ad10415696e5a3249bcba1810ba3c7ef80764962e
 +F ext/fts5/fts5_main.c 52e6b6fda96d6823de33c0fb0760562860b5891bf751fcf22d83421c7b0edb14
  F ext/fts5/fts5_storage.c 19bc7c4cbe1e6a2dd9849ef7d84b5ca1fcbf194cefc3e386b901e00e08bf05c2
  F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329
  F ext/fts5/fts5_test_mi.c 4308d5658cb1f5eee5998dcbaac7d5bdf7a2ef43c8192ca6e0c843f856ccee26
@@@ -624,11 -575,9 +579,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 9205e6e8f389ea44a8118082ce3832374da92284a60e4fb3ea6b1b421f0dbc54
 -F ext/session/sqlite3session.h b81e8536ce4b83babafd700f4ff67017804b6c1d71df963b30d3972958e7f4a7
 -F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
 +F ext/session/sqlite3changebatch.c d488b42d8fd49fb013a1e9c4535232680dabeb28ae8f9421b65ea0ccc3b430f7
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c 2ad9f70d174fbde763ba9701b7ee08cf095f2f7a0462df911ccac30e130d58a8
++F ext/session/sqlite3session.c 8fc3fc3c48d3a8d693d11d10886d63f8cb34e96937ce2975203c94294a2f3046
 +F ext/session/sqlite3session.h edbcaf0d39a9ae838a81cccb3e41ff424fa70b6d5434214ac3119b7d3d5bbd0d
 +F ext/session/test_session.c eea930cdd55dbf960a2f6b35d7050d118a44bbe9bca1e66c6793909f02783404
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
  F ext/wasm/GNUmakefile 35e730a01b32481f5483ea5bd72c3d4609e25f34cb5aab9f85eb3eba6f0c4935
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
@@@ -718,7 -667,7 +673,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 644df8f4c6cf98e48dcf2fdd8d1535404b4e4eb24140d9ed1e14d2970fdcdd38
 -F main.mk cff9f83b4d35304f433b922aa88cff8e8da826120a649a23cf381469a1afe635
++F main.mk 214782f3249b715e397ba1b6a7d5c788dc2c8932fdd352d9bf3fee720096b78d
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -726,29 -675,29 +681,29 @@@ F mptest/crash02.subtest f4ef05adcd15d6
  F mptest/mptest.c aa41ace6dbc5050d76b02548d3521e6bbccae4f0
  F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
- F sqlite3.1 9e426a150af072be26b0661bcd54567692d979e99bc7daf55b22b952ff8e41a6
+ F sqlite3.1 1b9c24374a85dfc7eb8fa7c4266ee0db4f9609cceecfc5481cd8307e5af04366
  F sqlite3.pc.in e6dee284fba59ef500092fdc1843df3be8433323a3733c91da96690a50a5b398
  F src/alter.c fc7bbbeb9e89c7124bf5772ce474b333b7bdc18d6e080763211a40fde69fb1da
 -F src/analyze.c 03bcfc083fc0cccaa9ded93604e1d4244ea245c17285d463ef6a60425fcb247d
 +F src/analyze.c ebfe8c9c55e44c5ca2bb885f84b133cde7a37e99ea5e3bf1c2782fb7e34b0882
  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 213a9d24c931ef4694564894cda8dac8dbeb1519d428fd2d7ae622ac357c05a5
 -F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
 +F src/btree.c 29f1051f14715bad3abd99df384e1f0ef2301121d08c2c87323d5d63f492a0b5
 +F src/btree.h dcda10d5a5d29690dc2739b8d4d416d136760ab1dbe88a2dd417855e1775e37a
 +F src/btreeInt.h c3b8750a8dd8bc9a38840be463e7d23899b9da08276fa442e2bb8efd1052bc48
- F src/build.c c747626a107b9e0f07df97222e6d0f0820594c41f99b9d0cd65d8ea52cf31b84
++F src/build.c 2d6a61557730bf8368f64be1e4117a15354683267a9b3c124485d9a23cc069bc
 +F src/callback.c bd1ecfce052f6a5854497b16e6cae4f39f314d62fe43bd4cdaa452ab93623f3c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/date.c 9db4d604e699a73e10b8e85a44db074a1f04c0591a77e2abfd77703f50dce1e9
- F src/dbpage.c b3e218f8ed74fcbb7fa805df8ca669a3718d397617b3d8a8aac3307dc315c4d6
+ F src/dbpage.c a6f7f16fde5656686b05705d41a4cb339db8262dc4d11699b7b40ba503db624e
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
- F src/expr.c 12d8a79f6a0eb9bfae2d468a6d5bd7b9a0ff00988b3f5326ec9bbaad61bbf385
+ F src/expr.c 0cad74107489c688449d7fec47b605c61a75c6da707031dfc4c76d1ac75667b3
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 -F src/func.c de47a8295503aa130baae5e6d9868ecf4f7c4dbffa65d83ad1f70bdbac0ee2d6
 +F src/func.c da56527c319a7a21550ac1a2c910de36d9c7e713cb9836c5dde66967da5d4e37
  F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b
  F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7
  F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf
@@@ -758,7 -707,7 +713,7 @@@ F src/insert.c dfd311b0ac2d4f6359e62013
  F src/json.c cb87977b1ee25ee7d27505d65a9261b687395bf895342c8ba566b7c01aee2047
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c d7edd8e671237539d795d30daaf888908a2c82e99bade4c78f3be021e8b7d655
- F src/main.c fe213e3bccacbadf3d7346569392d9f5f855f70426e0bfd43e6baa17f1bea655
 -F src/main.c 458e79da86c957a094c1c256136af43e7dfec2c58475ee9cbbda4dc202005021
++F src/main.c 5a9f2b05987f0f638af66773e49ce113a53d632c9da0049cd283e552795a868b
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -779,33 -728,33 +734,33 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c 44203777255d032402ffd4b5a03085872f35c8970f5d7b608933f7abf46072d9
- F src/os_win.c b8d3cfdf2f40e2f9715b7d8df64f3c0c7ee18743a2dd0c4fc70c1d57fa1aadc7
 -F src/os_unix.c e5760f2c43c7d7cf9e409abe6ac82d0cd327c2d748f0d65e4a430ac8f5774dc6
++F src/os_unix.c 2f9897845490c3f6b2c4e5201c10572645f26cac78f809e53196e75673945805
+ F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 -F src/pager.c e2a08d559d492507bca4fdadd8091c88baae3b65192222d91faf4d9a48120871
 -F src/pager.h fc0c95d27f2aefffcb39b4373b3557e89e1b4b9a36b183cc04d6f22002bf0ad2
 -F src/parse.y 619c3e92a54686c5e47923688c4b9bf7ec534a4690db5677acc28b299c403250
 +F src/pager.c b1494dfd4cddcbe599e963beb0f8715f9587e1fce1d7a8df55d5bce4bb5b3466
 +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/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
- F src/printf.c 71b6d3a0093bf23f473e25480ca0024e8962681506c75f4ffd3d343a3f0ab113
+ F src/prepare.c 2af0b5c1ec787c8eebd21baa9d79caf4a4dc3a18e76ce2edbf2027d706bca37a
+ F src/printf.c 5f0c957af9699e849d786e8fbaa3baab648ca5612230dc17916434c14bc8698f
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
- F src/resolve.c d3ee7ed308d46f4ee6d3bb6316d8d6f87158f93a7fd616732138cc953cf364f0
+ F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c 954435db41c923a3c03094994bda344359bb21373756f20e1e4678f4eeff58b4
- F src/shell.c.in 2be7d0b2ba7221bd991f96d0c72728c06cead09bec3965e230ad703c9daf0c8a
- F src/sqlite.h.in 4a87e3adb4ce8b054247850adde0f570cd95a94d6be9e09daad696090c410ae2
 -F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
++F src/select.c baf48b38fea6765887330cd09d5b52d573b782e7f4b565b890a1be5591f0e12e
+ F src/shell.c.in 51c8452b3e6b9a0dfa3df853dd16f147e5e4ae2002deb775cf8a2fccf01c3c6c
 -F src/sqlite.h.in 7ceea612f0b54f53676e082890a175c6ff247191671d90d20843fde3d6f7b663
++F src/sqlite.h.in c54a8cf81779c5b4cae2abb00ee867391b77c8562c56461a0aad4866f7964a56
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
- F src/sqliteInt.h a486cdf0bc96dd016c75c7d51efc0af30ad713f32bb168a0a0edb9ebcbd08d16
- F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
 -F src/sqliteInt.h 27c73e48878d31ef230ba867d1f8c3af6aed357fd93ccc605d3f1aae007ea62b
++F src/sqliteInt.h 5843a779aedc09eb4a3d4f7d435adbadfb53072639e4ef41104df592f322c9cb
+ F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 3c604c49e6cf4211960a9ddb9505280fd22cde32175f40884c641c0f5a286036
- F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
- F src/test1.c 5f7fc1bbb18d0cf2f22cf8b7d9c5b1db5df3a07499aafff763fce89f6cb0c645
+ F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
 -F src/test1.c 82d8aab7162a758d030728cab6ae6011785234854b7d6d2aebd877f985d1016a
++F src/test1.c bdaf7b1821d1be4e67580c0dd1fa0903d8bbb6abb273bb854e70b6c626db9daf
  F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
  F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
  F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
@@@ -854,18 -803,18 +809,18 @@@ F src/test_window.c 6d80e11fba89a179652
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 8400646d2830afc2f2dc465a75e3a92e4bedeea623f19dbd79c0c12d0dd6dda2
- F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc62279
- F src/trigger.c 3ffb8ed6b64dbcc0ccae6e82435d01be3bf547e13b814e2d46f7df9bef84748e
+ F src/treeview.c 3ce7ac9835d2d70cc1c868b01b747ae8a062322e155701e58e3d62ca79aada7a
+ F src/trigger.c d5cf2541ff048f30b6a0507eb3d1ec4e695c53584e3b2298a5bf248714fe185e
 -F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
 +F src/update.c e1a8b1876e6f2a1824a6b9f1999a03d5dd50ce250a1bb86ea133e5b4b359488b
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 -F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789
 -F src/vdbe.c 5115c71c194cec8b44f9fb8a9310ef634de70bbe7b1963de27ea67a37a58b03f
 +F src/vacuum.c 9e6ca9779ed3924fa6590a5a5ffe4d9233cead10144bbc285da44ff5519f7ec4
- F src/vdbe.c ed13cff86e7aeff3a9428083ebd6a19dd9acf31a0955a0c144e8c7768a7f6149
++F src/vdbe.c 7a3d763b1706dea19d815535998cc5a063d6b77ec5a44670738e95c220256ff5
  F src/vdbe.h ea1f1b52f0efe422f80d88da3c57e4eadc72856e29a22f1ff08e502ec6ba5f08
- F src/vdbeInt.h 626465ff6d673f73a2476dc230b7cd07bdaf4acea9d4ecceaa12a5174bb2c8d7
+ F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e
  F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df
- F src/vdbeaux.c b0bba7263952c46df5be66e8bb021729128971df19b904151258fb2c2b96ee4c
 -F src/vdbeaux.c 395650f5728918aa3f221ae00a1cb6e5f2bbbe26c8c4951f6c172b135197041a
++F src/vdbeaux.c a851468e72aa48fb191df7c34161904990cbde8fb92b7acb054348a3434345b0
  F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
  F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
  F src/vdbesort.c cb6f472e83ca12c46aa7de0ac0a9d11458b357986f2617a1c90dfb19a542ecbe
@@@ -873,13 -822,13 +828,13 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 6be26a83e5e73de1905d6a75b525cefc158264cb1e8f9519725f9ab4928ecb23
 -F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
 +F src/wal.c 8ed0a6b2acbfd67bbdf17710c8787555c2b98f26caba8922f25f8590a704946d
 +F src/wal.h 8d02ab8c2a93a941f5898eb3345bf711c1d3f8f86f4be8d5428fb6c074962d8a
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 6a9266dd1a559d48d8c7ca670a3e80143c7913153f7d1ceb0a4eca1087318951
+ F src/where.c f2f075bd17065922235632feb368efe92a7f03d42797eb575267574fbf6d4218
  F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da
- F src/wherecode.c 2a2d2993fd98c46f525f71b3bfd330fde73d8613aa0ff3e20402dd1fc63470af
- F src/whereexpr.c 78c28a8da187816d5d82049f2e343fb39f4a8e30b5bf1bda9b96cecde40ca8bd
+ F src/wherecode.c 71c5c6804b7f882dec8ec858758accae02fcfca13df3cc720f1f258e663ec7c5
+ F src/whereexpr.c 403a44eeec1a0f0914fccc6a59376b6924bc00ef6728fe6ffce4cf3051b320fc
  F src/window.c d01227141f622f24fbe36ca105fbe6ef023f9fd98f1ccd65da95f88886565db5
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test 4d7a34d328e58ca2a2d78fd76c27614a41ca7ddf4312ded9c68c04f430b3b47d
@@@ -1558,7 -1497,7 +1515,7 @@@ F test/pcache.test c8acbedd3b6fd0f9a7ca
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
  F test/percentile.test 52ba89d6ee6b65f770972b67dace358bab7cdbd532803d3db157845268e789cd
- F test/permutations.test 39167d98d86d2ff824b99e3a8c56178e4207bc10341c535cbe02e762892dad0b
 -F test/permutations.test db0a650837cf1eb2128b9c33aac8059933338cf25ccd4c7a089115d6b23368cf
++F test/permutations.test 965b59d667eac286a6dc74c7cc93943683834708bb6870028b6f12af8faec68f
  F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
  F test/pragma.test 7d07b7bb76e273215d6a20c4f83c3062cc28976c737ccb70a686025801e86c8f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@@ -2250,8 -2186,8 +2209,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 a6f6fbe6173de8a2c366542432c01efcf959848972e047acf856817605e6b01e 69794955d8c7bec008ad07217e37d04f024e0ee52a3828e76a705c35aeaa7052
- R e5f54c4cba39b30fe1e22e4f4c626045
- U drh
- Z f70f62a7c4fac66eca089e4094acea6e
 -P 69794955d8c7bec008ad07217e37d04f024e0ee52a3828e76a705c35aeaa7052 26ecdde06cce063143144a79c0b4979ed5ec27548da6f127176a420c1c3f17ce
 -R 56c824d4d65cb2eca9bcd9967fcc9e1a
++P ba2174bdca7d1d1aadf0a4de1e01aeba3d95b6656cb9ecdff88b00cfbef8f3a9 8b881fd828d6d1cc4d42064e4c2b5fa47de473de196a830c35b18d2becfba61b
++R b58de5559edb5f8fe8d5549a1b1a8a4d
+ U stephan
 -Z bff2d7ceb58a2df6a6230f9ce226462b
++Z 0b2b1d7e0fe9ff0fe61e6f529a0e48ff
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.tags
index 0000000000000000000000000000000000000000,cd8c36ad46807fce927cd2cf71fa2919a07d98b3..d2f128659288415b5efec6b14f86b2d6c0e0d87d
mode 000000,100644..100644
--- /dev/null
--- 2/manifest.tags
+++ b/manifest.tags
@@@ -1,0 -1,2 +1,2 @@@
 -branch wal2
 -tag wal2
++branch bedrock
++tag bedrock

diff --cc manifest.uuid
index 21a1eb8a7d498f7b24d24a338f742d677cffb07b,99699fee14fd39ad1c9717d6d2f864a85983d6b8..0cd2fda8aae66435ad125e752d3f065522725051
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ba2174bdca7d1d1aadf0a4de1e01aeba3d95b6656cb9ecdff88b00cfbef8f3a9
 -8b881fd828d6d1cc4d42064e4c2b5fa47de473de196a830c35b18d2becfba61b
++21e4744de2cf22a6d65ed68e943a385dac0b58aa46c01db07e9abefea9463190

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/select.c
Simple merge

diff --cc src/sqlite.h.in
index 788bc862f4c6eb7590a76a7a86a33ce254cbe711,4dace4a813a96f66dfa91841dbc2fc8aa00d5694..aa4f9ae4ea567ad727a0ec7a829d2cdfd87adad8
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -10908,33 -10917,8 +10917,33 @@@ int sqlite3_snapshot_cmp
  ** This interface is only available if SQLite is compiled with the
  ** [SQLITE_ENABLE_SNAPSHOT] option.
  */
- SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
+ int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
  
 +/*
 +** CAPI3REF: Wal related information regarding the most recent COMMIT
 +** EXPERIMENTAL
 +**
 +** This function reports on the state of the wal file (if any) for database 
 +** zDb, which should be "main", "temp", or the name of the attached database.
 +** Its results - the values written to the output parameters - are only
 +** defined if the most recent SQL command on the connection was a successful 
 +** COMMIT that wrote data to wal-mode database zDb.
 +**
 +** Assuming the above conditions are met, output parameter (*pnFrame) is set
 +** to the total number of frames in the wal file. Parameter (*pnPrior) is
 +** set to the number of frames that were present in the wal file before the
 +** most recent transaction was committed. So that the number of frames written
 +** by the most recent transaction is (*pnFrame)-(*pnPrior).
 +**
 +** If successful, SQLITE_OK is returned. Otherwise, an SQLite error code. It
 +** is not an error if this function is called at a time when the results
 +** are undefined.
 +*/
 +SQLITE_EXPERIMENTAL int sqlite3_wal_info(
 +  sqlite3 *db, const char *zDb, 
 +  unsigned int *pnPrior, unsigned int *pnFrame
 +);
 +
  /*
  ** CAPI3REF: Serialize a database
  **

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
index da2df33bf73661932b33678dfccc0fbeb5252957,92be700669eecfbf68a41c7ea7c2b1723067e7d2..603f3915cc4612dfa579620b90496cef44a0d494
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -3909,9 -3909,8 +3909,9 @@@ case OP_Savepoint: 
        ** is committed.
        */
        int isTransaction = pSavepoint->pNext==0 && db->isTransactionSavepoint;
 +      assert( db->eConcurrent==0 || db->isTransactionSavepoint==0 );
        if( isTransaction && p1==SAVEPOINT_RELEASE ){
-         if( (rc = sqlite3VdbeCheckFk(p, 1))!=SQLITE_OK ){
+         if( (rc = sqlite3VdbeCheckFkDeferred(p))!=SQLITE_OK ){
            goto vdbe_return;
          }
          db->autoCommit = 1;

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge