Merge trunk with this branch.

FossilOrigin-Name: 853c621bb2cf9995a6c942376a3760b90abeacafef29f364bea41d270aee385f

diff --cc manifest
index 9c6cab4b9dc48498eaa7208433872347e0ae4a3b,c28c4a866711961aef6154bdc1cbf7734c6435b6..bddb9aed30e94e7a153ffa8f52271856eee79667
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experiment\swith\shaving\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\son\sunix\suse\sa\scondition\svariable\sto\swait\sfor\swal\slocks\sheld\sby\sother\sthreads.
- D 2021-07-16T18:30:27.066
 -C Updates\sso\sthat\s"threadtest3[.exe]"\scan\sbe\sbuilt\sfor\swindows\swith\sMSVC.
 -D 2021-07-19T16:49:13.643
++C Merge\strunk\swith\sthis\sbranch.
++D 2021-07-19T17:06:43.780
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1465,7 -1465,7 +1465,7 @@@ F test/thread2.test f35d2106452b77523b3
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
- F test/threadtest3.c f39994e150bc2c5b61e041905249b49623ada3223ed772454343b22f96ef67ab
 -F test/threadtest3.c fee869dba633f8403a7eef03bb038a3fc45f0814b9f829ea79a914fcc11f0218
++F test/threadtest3.c 6912b782e1ec573974f7a146c17aa04145fa13427f98209db6d89066d622c80d
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
  F test/threadtest5.c 9b4d782c58d8915d7e955ff8051f3d03628bda0d33b82971ea8c0f2f2808c421
  F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
@@@ -1920,10 -1920,7 +1920,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 1594056aab068b9fae82f6b885828c7127d9bedcc37c4340486e32791bc87c7a
- R fc7634cfdafbf55388fafa77867b7fbb
- T *branch * unix-timed-wait-exp
- T *sym-unix-timed-wait-exp *
- T -sym-trunk *
 -P c8601d83fbecf84ca7991d339449b380deb5a7620dc84756a91c2880f030b423
 -R e7c3798c4e8afbc59f637b8a384b4003
++P 4a9f5ce79d349a5a352c4a5524ace82611ab1058a3e6cb012ee7d0071f9c8cd2 4ce585fb07274284e3add6adcb66ed06e4b109584704d1ec7152bf43ca8d5d85
++R 39e619a8edaf99a2aad2b52392a1b555
  U dan
- Z 91d9b974e91effdc9a593e4e66c579de
 -Z 4507211c89102df26f9a64f266826b29
++Z 82965873af02dab516e7cbadbd7c025e

diff --cc manifest.uuid
index a04fee8202a0b284bfacede404f2bca0103ae655,77230210639a5c5f666ed94dc303294527b4176e..1e34de67a5c1d24b50dbde800d3049457da5c16a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4a9f5ce79d349a5a352c4a5524ace82611ab1058a3e6cb012ee7d0071f9c8cd2
 -4ce585fb07274284e3add6adcb66ed06e4b109584704d1ec7152bf43ca8d5d85
++853c621bb2cf9995a6c942376a3760b90abeacafef29f364bea41d270aee385f

diff --cc test/threadtest3.c
Simple merge