Merge latest trunk changes into this branch.

FossilOrigin-Name: d67a42d62555cf9294e11a04d3c7cfdf11ca7978d60fc085f5a73e36aff8313e

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 4d1256ddc4f88fa212f46b46209911a5f13d0b7d,b00387a4afc5ba42dcb3221bdbe8bb9e9a1dc18f..933c5731bebafb6d8f511300124cb6fba8db9e45
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Test\sthe\scase\swhere\sa\sdb\sconnection\sblocks\sfor\sa\swhile\sand\sthen\ssuccessfully\sobtains\sthe\slock.
- D 2024-12-09T17:30:20.069
 -C Fix\sharmless\stypo\sin\sa\scomment\sdescribing\sthe\scolumnMallocFailure()\sfunction.
 -D 2024-12-10T12:32:34.191
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2024-12-10T17:36:20.046
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
  F Makefile.in 86e81bdb118bf332a27865090b7dce96ddde93c2f1586e1b911569acaa228f19
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc 9a975438b8e06da44bc169b74aa9601cd48da52abd2c88e8a349c7d82b59d250
 -F Makefile.msc f402bb6ea63b44f5143aa3c637aa3f69794cf14b1cc964eb97c4f53124198561
++F Makefile.msc 28234637cc040c593f01eb753f233668d06a93134176918e5aae539c84005a53
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -786,9 -786,9 +786,9 @@@ F src/sqliteInt.h 77be043f8694f4a8702d0
  F src/sqliteLimit.h 6993c9cfe3af5b8169ae0e5f15627fc15596726d4f1dc90a221309f79715ce88
  F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 1c2f697cb12a1d49f5e0b448327f7cf614809423bb43753b2d97f87354298113
+ F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
 -F src/test1.c 2d507751bfb4aa254dc22588ef1e3c5c5cfcb2e636d0e6e1fa0bbd307669c2a8
 +F src/test1.c 325a66d5e52b84ba6b6d54f9d605e31a8304c395df0c589e0ade87fd2b7213b2
  F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
  F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
  F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@@ -2021,7 -2021,7 +2021,7 @@@ F test/walro.test cb438d05ba0d191f10b68
  F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc
  F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
  F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b
- F test/walsetlk.test 910a8ef8cc500b0be5cf818e2fff7a4505186d33bf08147dc23e38f78d0b2016
 -F test/walsetlk.test 34c901443b31ab720afc463f5b236c86ca5c4134402573dce91aa0761de8db5a
++F test/walsetlk.test 502cd17ebd2b4fcb7a2f67c3612582ae9da416c756affb652064c16ce365c16d
  F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3
  F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23
  F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
@@@ -2202,8 -2202,8 +2202,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 c892242bb642f7a6a961e310ed8b4f1e140f8ee32c00f50021c6011c6e7e1476
- R c5bbc43d548daaa55d847d34080f9ae5
 -P e2bae4143afd07de1ae55a6d2606a3b541a5b94568aa41f6a96e5d1245471653
 -R 2598afb576d42f15287920900e8ec8ce
 -U drh
 -Z 1b0b57ce5dbae36a7c77d0612b9489d6
++P 9cbc97ff8411a672b572000e4509ac02b3d29911be5ce1bcf334ed8e2a91db77 0f3b484fd71fd77947a1de7c24f35f8eed2911d0565d03edb7970b8f3092a5da
++R b4b044f08598c4c125c36b0936a05c1b
 +U dan
- Z 080db00c6e437599cb3a53612222f7cd
++Z 7839b247a1c08690f8454e1a17953ba8
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 364baa9b7a723a0c5d319d4635d1490c08f8c1ae,fd05a4c44ef52027785838c548d60906ff6e6feb..9ad9e4ac3feb4ec65fd3e6529c50db8002b0cb09
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9cbc97ff8411a672b572000e4509ac02b3d29911be5ce1bcf334ed8e2a91db77
 -0f3b484fd71fd77947a1de7c24f35f8eed2911d0565d03edb7970b8f3092a5da
++d67a42d62555cf9294e11a04d3c7cfdf11ca7978d60fc085f5a73e36aff8313e

diff --cc test/walsetlk.test
index 1f1c0b7c3207e4364bccc7b71f7502d002740348,1e092382265e1babc944eaa99d0c105004e76aab..ae53976cf002bfaf59e1644299bb163d3050684b
--- 1/test/walsetlk.test
--- 2/test/walsetlk.test
+++ b/test/walsetlk.test
@@@ -244,45 -196,4 +244,50 @@@ do_test 3.1 
    list [catch { db2 eval {BEGIN EXCLUSIVE} } msg] $msg
  } {1 {database is locked}}
  
- set bExpect 0
 +do_execsql_test 3.2 {
 +  COMMIT;
 +}
 +
++
++# Launch a non-blocking testfixture process to write-lock the 
++# database for 2000 ms.
 +testfixture_nb done {
 +  sqlite3 db test.db
 +  db eval {
 +    BEGIN EXCLUSIVE;
 +     INSERT INTO x1 VALUES(3, 4);
 +  }
 +  after 2000
 +  db eval {
 +    COMMIT
 +  }
 +}
 +
 +after 500
 +db2 timeout 5000
 +do_test 3.3 {
 +  set t [lindex [time { db2 eval { BEGIN EXCLUSIVE } }] 0]
 +  expr ($t>1000000)
 +} {1}
 +
-   set bExpect 1
++# Set bExpect to true if calls to xSleep() are expected. Such calls are
++# expected unless this is an SQLITE_ENABLE_SETLK_TIMEOUT=1 build.
++set bExpect 1
 +if {$::sqlite_options(setlk_timeout)==1} {
++  set bExpect 0
 +}
 +do_test 3.4 {
 +  expr {$::sleep_count > 0}
 +} $bExpect
 +
 +do_execsql_test -db db2 3.5 {
 +  INSERT INTO x1 VALUES(5, 6);
 +  COMMIT;
 +  SELECT * FROM x1;
 +} {1 2 3 4 5 6}
 +
 +db2 close
 +tvfs delete
 +
  finish_test
 +