From: dan <Dan Kennedy>
Date: Mon, 2 Jun 2025 18:48:36 +0000 (+0000)
Subject: Fixes to ensure SQLITE_ENABLE_SETLK_TIMEOUT builds use a blocking lock and do not... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9269b212bf14b8dbd97fdd04fe70386e6b3ba584;p=thirdparty%2Fsqlite.git

Fixes to ensure SQLITE_ENABLE_SETLK_TIMEOUT builds use a blocking lock and do not call xSleep() when (a) opening a snapshot transaction, and (b) when blocked by another process running recovery.

FossilOrigin-Name: 7f9c0cdd0630a41db359b188b226a1ad6a3bae1663c27169acfe25edc7fb171b
---

9269b212bf14b8dbd97fdd04fe70386e6b3ba584
diff --cc manifest
index 2f6ccd2006,96ed7e1f99..742e098a5e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improve\sthe\saccuracy\sof\saffinity\sand\scollating\ssequence\sanalysis\sfor\nNATURAL\sJOINs\sto\sthe\sleft\sof\sRIGHT\sJOINs\swhere\ssource\stables\sare\sviews\nor\ssubqueries.\s\sInitial\sproblem\sreport\sin\n[forum:/forumpost/829306db47|forum\spost\s829306db47].
- D 2025-06-02T18:34:17.422
 -C Fix\sos_win.c\sso\sthat\sSQLITE_ENABLE_SETLK_TIMEOUT=2\sbuilds\swork\son\swindows.
 -D 2025-06-02T18:37:32.126
++C Fixes\sto\sensure\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\suse\sa\sblocking\slock\sand\sdo\snot\scall\sxSleep()\swhen\s(a)\sopening\sa\ssnapshot\stransaction,\sand\s(b)\swhen\sblocked\sby\sanother\sprocess\srunning\srecovery.
++D 2025-06-02T18:48:36.921
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2207,8 -2209,8 +2209,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P bf7be67e3fb7b75fc281997f7bf9aa69eaf4da6bdf2fefe359b12d25ec95f512
- R 1f718a77d399990842b8b713bc67dc26
- U drh
- Z a6d9c9cd6e3fa998e21f0f81450c5cf2
 -P c6d3e3542fdf6a3428d3a2ec20c699c169ed53341dc782d81f7fe5944f769748
 -R 12703d8bfffd8f861886bb5cc39d7c30
++P f184d1d236e47962658a4639d9533f67a525b74cfe0f06c93e9b85fdcd02a15f 8efb95e0d4670b9c5dbd8cf34512334f47951a8dff8fdadc8645f75076acd91f
++R 87f8c350d69796fb64023493aed9406c
++T +closed 8efb95e0d4670b9c5dbd8cf34512334f47951a8dff8fdadc8645f75076acd91f
+ U dan
 -Z 45c47e26e2dabffe2552459e6f2df0ee
++Z 2e11cb3824d33d1f7410effb2728f2aa
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index af5d180aaa,2655359b9b..673bfd6f14
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f184d1d236e47962658a4639d9533f67a525b74cfe0f06c93e9b85fdcd02a15f
 -8efb95e0d4670b9c5dbd8cf34512334f47951a8dff8fdadc8645f75076acd91f
++7f9c0cdd0630a41db359b188b226a1ad6a3bae1663c27169acfe25edc7fb171b