Fix an assert() in sqlite3WalFindFrame() so that it matches the equivalent assert...

FossilOrigin-Name: f5bf91d9bf3910ab3dcf44c138084dfc26fb123edb8934bfdfcdd5c4afb67f2d

diff --git a/manifest b/manifest
index 05a28527d9e71fb393818c2a1b0e369686c79abe..fec72887fefd2e72e7c5491d2f87c9e0f8cdce07 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\san\sinvalid\sassert().\s\sAdd\sthe\s"WAL2"\scompile-time\sproperty\sso\sthat\ntest\sscripts\scan\smore\seasily\sdetermine\sthat\sthey\sare\sdealing\swith\sa\nWAL2-capable\sbuild.
-D 2023-02-06T19:00:53.294
+C Fix\san\sassert()\sin\ssqlite3WalFindFrame()\sso\sthat\sit\smatches\sthe\sequivalent\sassert()\son\strunk.
+D 2023-02-07T10:58:39.543
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -705,7 +705,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
 F src/vtab.c a39f6ed161f16a84ff445af9dba4776b2cf0898be08a33bee8e1128a66c0074b
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c b433980d0e97fa3469cb46136fd59194df638c684afc299b662b1114f3495af6
+F src/wal.c d9645dd2b606b5df93cc21b072cabab30ec9a20de826a6059cc08c73d889dd25
 F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 3bbca705410258969d6d2e0c54b468de9674445d41b67714bb4fc3f1edef41d2
@@ -2059,8 +2059,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 44f8f33d4ab159476800142e763dfc6beb2c2c1d857c8eebb286498dec4004fd
-R 4a29884f29ee8d2f8e34960946ff4a8b
-U drh
-Z 5908cdab3a7ef3394b937ba8240e9eba
+P e93113259e05fb6b81ad1b4a460bd54168ff5c372b643d4845c1b1c87b7db204
+R 0cf0e867c1d072053e4612b80f259abc
+U dan
+Z 5cf3b3810b537b2d719a6a64e959fd37
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a1815f8b787a8d2d79d6d5c1e158a90c59de0512..56dbbc51f5a62ea4d4bfc4bbe2230682525be52c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e93113259e05fb6b81ad1b4a460bd54168ff5c372b643d4845c1b1c87b7db204
\ No newline at end of file
+f5bf91d9bf3910ab3dcf44c138084dfc26fb123edb8934bfdfcdd5c4afb67f2d
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 113c07c3d2d5a470504a3c5bbdd5ebba5fd56b4f..1dd95d69ec26f35fbf3a9e36c75809b066f590bb 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -3888,7 +3888,7 @@ int sqlite3WalFindFrame(
   /* This routine is only be called from within a read transaction. Or,
   ** sometimes, as part of a rollback that occurs after an error reaquiring
   ** a read-lock in walRestartLog().  */
-  assert( pWal->readLock!=WAL_LOCK_NONE || pWal->writeLock );
+  assert( pWal->readLock!=WAL_LOCK_NONE || pWal->lockError );
 
   /* If this is a wal2 system, the client must have a partial-wal lock 
   ** on wal file iApp. Or if it is a wal system, iApp==0 must be true.  */