Merge the latest trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: 99293f4f724c560fea8e7239f611906d5bd6c8d29f4ab244375b60810e9b45f6

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 16c68950f5c53a0c2de7bc5c17cbb88b9638dbac,dbe9f57581e7ff80d6c73713e32f31b177010728..bec2ed0532002ebe528bf951b0998a091d0c2b3b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Resynchronize\sthe\sbegin-concurrent\sbranch\swith\strunk.
- D 2024-12-16T12:19:35.593
 -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\sbegin-concurrent\sbranch.
++D 2025-01-03T15:07:37.702
  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 5101ade4944bfb26603d0765c846cca5364aa5504644483380d53ea618ac97b4
 -F Makefile.msc eed0c40c365d100f3329e8fb7d0e18bad09a6f0c026aa1e4dc7f88270378929d
++F Makefile.msc 7e070aa58b5ea0f21cf1c4bdf5df9c10e22b7ac1b4c10dbff8c2c5eea229544e
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -55,9 -55,8 +55,9 @@@ F autosetup/system.tcl 51d4be76cd9a9074
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 +F doc/begin_concurrent.md e694a2a1c623833e7de8b688e81ec30fd4439a78d6b74be61bce0b1e8f590470
  F doc/compile-for-unix.md 7d6a5770611ea0643de456b385581923dac7c0a7c3758825dda810d12fc3e5b2
- F doc/compile-for-windows.md 17e1491897a117ff0247531a61671b26d487bc1dad25c3894c04ad4fca936a7f
+ F doc/compile-for-windows.md 791f1754fcd669b0a8fdcdc0fdd56eff8c148add7457e8bf4863b46829966fc1
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
  F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
  F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
@@@ -704,7 -699,7 +704,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 056917a7cb0ad28d40f40bdd403394acd3ee55fabbc66822680e670eeeab518a
 -F main.mk fde6ef9167ab1972f6273c0cc06a7d2d776f562d06f44f4987868335910f3803
++F main.mk d30956419c83000d281b5fae1b602aa158506a44f67053a581047d180e5ecd66
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -735,7 -730,7 +735,7 @@@ F src/delete.c 03a77ba20e54f0f42ebd8edd
  F src/expr.c 3329173aacc6c37da3971b6253827799b32e301673be00126df8271bf018e15f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
- F src/func.c 1394c790bd97ad6b947fe57d1f8484404b40ce4f1e3ee1e86daefd1e64ffd5a2
 -F src/func.c 89b733a5f513c4bc06b7271384363d5693d62782de8295bc87b97d79862c9714
++F src/func.c f4bcf21772a5848fa4fe8f45102da6c32653fe8b359823b54133e4b705a2773f
  F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b
  F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -766,12 -761,12 +766,12 @@@ 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 d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6
 +F src/os_unix.c 24a82109b67c1771500c1f398eda0278d95f9c3bedc71d2cb1a48db39a56a787
  F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 4c8b569b6745efd0e2af57ac00b9a4c73451b8aa0ed51fedecbaa7523c1111bb
- F src/pager.h 597ed34563ffa2588e37e556e2f0f9326f62492a459330ed3aaf6739f1e6a665
 -F src/pager.c 2fdd489447aa6bb0f672973bacb801ced92225ca9a1c874ed9b856d2741dc54e
 -F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
 -F src/parse.y dcf45a81b61223ac93e61fdfe9b22d635dd371c446e8222634d90aa37e25e5f6
++F src/pager.c 9ca477a922b1fbf34fbf9fface9a931f2b8ceab03265dd2bc49e9d238539c3e2
++F src/pager.h bc603f12d047db2643989ed1c254d32aa9c610d31b5bb02d94858e658bf63af1
 +F src/parse.y 5e6958ec69f538fe98f22dda2ace520eabcda314c651f48546ce72c8c0b4e221
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@@ -844,9 -839,9 +844,9 @@@ F src/test_window.c 6d80e11fba89a179652
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c fe17e03175cae35b6694d0f879e7bc3d1ddea2fd4ab148cba9bbd025b7a7bb12
- F src/treeview.c 921392561385e05ef5703f20a7a72f0a0a45c1fb749558d7467fae2c3f525006
+ F src/treeview.c d1f3003cb21846828f314a304cf9117f5e80ce0be259315a681d25147004d26d
  F src/trigger.c 247e2d712d5edc6021d52a169f6ac9a9c10d7144bc4ac7ea06c1ed2aa414659f
 -F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508
 +F src/update.c 50baf763bfe5f3bf6b0e1ee1e6c0b7d10dca2ec28f2ff61b787d78d0edf81ec4
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba
  F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850
@@@ -855,7 -850,7 +855,7 @@@ F src/vdbe.c 09fdbd710d193968819a491cb7
  F src/vdbe.h 9676348d342bd04e21e384c63b57224171ce84fac77853357334ef94c4d33cf4
  F src/vdbeInt.h bf294a0c8fc4cc80779e74b04b8bd82c6e1197b3137cefe0b16cdf002fc7dfd6
  F src/vdbeapi.c 38c252a202d70b56cfb734460bc888ddbd581afec1a10cd4d6c894c9e0b5baea
- F src/vdbeaux.c 38c7c7fe45645c122c36866b0ba065898d5ab23834a7b19b5a71b09337e5a4fe
 -F src/vdbeaux.c 5fcbc642a3d3d88c5ea15cadf2c8b8e4e067cb9ff374beb1875c9d209001299e
++F src/vdbeaux.c 01e8838e036feb7cd672fbd79f3c3d8e7b0ece9353c2754921cafd0b564b4157
  F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
  F src/vdbemem.c df568ef0187e4be2788c35174f6d9b8566ab9475f9aff2d73907ed05aa5684b2
  F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@@ -863,10 -858,10 +863,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 c6add778fbb08ff7c5ec3663595e49140ec4472895c748b48766fa2db8ddc7b3
 -F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997
 -F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
++F src/wal.c 456537d6998f31efdd533b5ba05172799f7a115eef800375f3f615e468fa2547
 +F src/wal.h e9aeb67102d9b9a0b089b80bd6136a16dd6360ac3daa731f2b71c6d4f8341717
  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
@@@ -2219,8 -2204,8 +2221,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 019b04342861589cd3bf64006f30b682d8c778b685cefd071327acefba8e55b1 ae580443d210811c12209866112fc8b0b83281e24945504b748a17d93ad84062
- R 1f747555ec6d9ac4f6898cf3a2eeefc2
 -P 1291b013a8c93e7001fe25783bc98d12f5f7c341d1f728e6852632e18a38af58
 -R 0507e66ed59bfa5a55bc14583a9d765f
++P e4718a04be1617ca965dc548e77be85bd50a08b40a5cac268373666e82f3a70f 9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++R 7f6c96d2095b74b30f87592667f3d33c
  U drh
- Z 369b6546cfdb3f157af5551b7b930f4a
 -Z 3304d535a779543ccf066c65753e6b08
++Z 386af59d4c37a50b0c9b92a0439fdaeb
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index a7394d0d74e665187650f458e52dc4eae938a4ab,d506d57c15678d03f80237ecc3b6ce075b86dd1e..59fdfb940aab54536652750de533c07a8b4e18b9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e4718a04be1617ca965dc548e77be85bd50a08b40a5cac268373666e82f3a70f
 -9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++99293f4f724c560fea8e7239f611906d5bd6c8d29f4ab244375b60810e9b45f6

diff --cc src/func.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge