From: dan <dan@noemail.net>
Date: Thu, 7 May 2020 14:39:56 +0000 (+0000)
Subject: Changes to avoid deadlock in SQLITE_ENABLE_SETLK_TIMEOUT builds.
X-Git-Tag: version-3.32.0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b28f44eba257b89a1809b33b2892abe9aa1b7515;p=thirdparty%2Fsqlite.git

Changes to avoid deadlock in SQLITE_ENABLE_SETLK_TIMEOUT builds.

FossilOrigin-Name: 652e4b23fffbff128b177697d7217b7d5aad8baf2364df1646b268ce6774e0fb
---

b28f44eba257b89a1809b33b2892abe9aa1b7515
diff --cc manifest
index b053ae4c69,c9dbb5cb17..5c9d5d6b83
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\shandling\sof\sreserve-bytes\sso\sthat\sthe\smaximum\svalue\sof\s255\scan\sbe\sused.
- D 2020-05-07T01:56:57.057
 -C Fix\san\serror\sthat\scould\soccur\sif\sthe\sfirst\stransaction\sexecuted\sby\sa\sconnection\sconfigured\sto\suse\sblocking\slocks\sis\sa\swrite-transaction\sfor\swhich\sthe\sWRITER\slock\scannot\sbe\sobtained.
 -D 2020-05-07T14:26:40.925
++C Changes\sto\savoid\sdeadlock\sin\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds.
++D 2020-05-07T14:39:56.994
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1863,7 -1864,7 +1864,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 63e659d9a793227604aa95685a8d83cd08305f1d01e135407a3ffc6d54482ab8
- R 40c51b3c9fb1a999bf30ad6cc83f2430
- U drh
- Z 4244c9fee796a92a9333ce7d1083a8fb
 -P ac4ee69664278a828e0a64c5be3b96fdb6eb6acc95646a9425c667aea328791c
++P 99749d4fd4930ccf15227f67c732266af9e09dd3cabdc0834fb450ef98196441 49e4dc72f7a4b28e4b49d7b91030bc986aea3ff44dac38cb6e68305800cd1de5
+ R 22b4478e3cf3c244a4ab3e6943ce3c12
+ U dan
 -Z e85493d3ac63dab3b3e9ea5cdd9d6a6e
++Z cc31196848103ce16439278453597677
diff --cc manifest.uuid
index 954b434a4f,6f07e8c3df..08430064a8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 99749d4fd4930ccf15227f67c732266af9e09dd3cabdc0834fb450ef98196441
 -49e4dc72f7a4b28e4b49d7b91030bc986aea3ff44dac38cb6e68305800cd1de5
++652e4b23fffbff128b177697d7217b7d5aad8baf2364df1646b268ce6774e0fb