From: dan <Dan Kennedy>
Date: Tue, 25 Feb 2025 11:29:04 +0000 (+0000)
Subject: Remove an assert() added by [e88212b1] that is sometimes false.
X-Git-Tag: major-release~247
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4cf066d64cde843ee78a546907a1091b320bf98;p=thirdparty%2Fsqlite.git

Remove an assert() added by [e88212b1] that is sometimes false.

FossilOrigin-Name: 0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5
---

diff --git a/manifest b/manifest
index 223ce17db6..991f86dae8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Support\sSQLITE_ENABLE_SETLK_TIMEOUT\son\swindows.
-D 2025-02-24T21:27:16.284
+C Remove\san\sassert()\sadded\sby\s[e88212b1]\sthat\sis\ssometimes\sfalse.
+D 2025-02-25T11:29:04.914
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -862,7 +862,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 2c69a5f92270429db72d853691b0640c76c671d5b2465396dadb9d9873e1efce
+F src/wal.c a9924069336c4658b2edca78329dfa882625d9994abd3ddb0844f01d367bbd43
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c 12cca5dfbe96e2589f951c43c0720fc58e52611787c37d85a0d9c10376202e8b
@@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce 55324d1c862c42b95251a398c40930d9fa94debb1aec7d3d0ae734d6b17b4a59
-R 2117afef50ba03929efd8c7065744408
+P e88212b10a7829ff42ef51a02863d788c929e54161faf492f9ef2ad90fd7074e
+R 208c10d1a99423d6443e5484adf3eb06
 U dan
-Z f60d38f782589947a9438a2ed64b4320
+Z 8b4b4e6eeb34d8972dfc2e11c0d63f24
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0b9834aaf6..717b9c03f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e88212b10a7829ff42ef51a02863d788c929e54161faf492f9ef2ad90fd7074e
+0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5
diff --git a/src/wal.c b/src/wal.c
index d374d6eb4d..a6287a4081 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -3482,9 +3482,6 @@ int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
 ** read-lock.
 */
 void sqlite3WalEndReadTransaction(Wal *pWal){
-#ifndef SQLITE_ENABLE_SETLK_TIMEOUT
-  assert( pWal->writeLock==0 || pWal->readLock<0 );
-#endif
   if( pWal->readLock>=0 ){
     sqlite3WalEndWriteTransaction(pWal);
     walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock));