Minor tweaks to the previous, for testability.

FossilOrigin-Name: decb69015457b4f70cf574aeef87d40f9de60b94965f4a915e8d0cd7559ef2ae

diff --git a/manifest b/manifest
index 8c22fb57d4fb4541f5d0dfa6d6ef334a1213fdb3..11d486ea92d8fc56888f899dae1d0580e5283e6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\san\sobscure\srace\scondition\sbetween\sa\scheckpointer\sand\sa\swriter\swrapping\saround\sto\sthe\sstart\sof\sthe\swal\sfile.
-D 2026-03-03T17:34:01.231
+C Minor\stweaks\sto\sthe\sprevious,\sfor\stestability.
+D 2026-03-03T18:21:22.946
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -808,7 +808,7 @@ F src/vdbetrace.c 49e689f751505839742f4a243a1a566e57d5c9eaf0d33bbaa26e2de3febf7b
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 F src/vtab.c 5437ce986db2f70e639ce8a3fe68dcdfe64b0f1abb14eaebecdabd5e0766cc68
 F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab
-F src/wal.c 47e0d493ee7e5a9942467bf992f156d407e432af2b80bf0759a0b38d65a6505c
+F src/wal.c 88d94fd15a75f6eda831fa32d1148a267ea37bf0a4b69829a73dfde06244b08f
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c 9f09ee7b260010138d5f9fb5f195b98051119eae3096a99d72ff16c83230f4af
@@ -2004,7 +2004,7 @@ F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 F test/walpersist.test 8d78a1ec91299163451417b451a2bac3481f8eb9f455b1ca507a6625c927ca6e
 F test/walprotocol.test 1b3f922125e341703f6e946d77fdc564d38fb3e07a9385cfdc6c99cac1ecf878
 F test/walprotocol2.test 7d3b6b4bf0b12f8007121b1e6ef714bc99101fb3b48e46371df1db868eebc131
-F test/walrestart.test e5caacd7fc0a13055a5f567f11afd99724ab827d8c0bd0670958ffedb6325b8f
+F test/walrestart.test 3e5eeae4fa3e4f0bf06119586723a5910a55a5e8594c127ee8c2abc996f4f0bb
 F test/walro.test 78a84bc0fdae1385c06b017215c426b6845734d6a5a3ac75c918dd9b801b1b9d
 F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc
 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
@@ -2189,11 +2189,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 88dce64242552e7443d9fb496f6f3ad71dc5b4a882ce21b7ef1d5ea4e26f1e61
-R 7123c2f78c4a83a2b9a28313122c346f
-T *branch * wal-restart-fix
-T *sym-wal-restart-fix *
-T -sym-trunk *
-U dan
-Z f02d11aee2845419e316ead57cf24834
+P 053bd3930f827156fd67ea4546a36227cffbb6f8bada3b5d1a7cf5f1867ac624
+R 1e139d97b47e05b58d0b2ca5e08e6ef9
+U drh
+Z 99ed9b0d5ac817bdb1642f3f701fad1c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 6f85c8ff9fd690100d90b85fa918eec4353c43b9..9f116798ddd2a2f0129ed95e910dbc1d33a265be 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-053bd3930f827156fd67ea4546a36227cffbb6f8bada3b5d1a7cf5f1867ac624
+decb69015457b4f70cf574aeef87d40f9de60b94965f4a915e8d0cd7559ef2ae

diff --git a/src/wal.c b/src/wal.c
index 54b72cc5629a3e061589cfd6fa28e25ed058a0f1..7f7bee62627aed6b3c4c8362e69a7d30a1141897 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2263,8 +2263,8 @@ static int walCheckpoint(
       ** pInfo->nBackfill had already been set to 0 by the writer that wrapped
       ** the wal file. It would also be dangerous to proceed, as there may be
       ** fewer than pWal->hdr.mxFrame valid frames in the wal file.  */
-      if( 0==memcmp(pLive->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt)) ){
-
+      int bChg = memcmp(pLive->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt));
+      if( 0==bChg ){
         pInfo->nBackfillAttempted = mxSafeFrame; SEH_INJECT_FAULT;
   
         /* Sync the WAL to disk */

diff --git a/test/walrestart.test b/test/walrestart.test
index f7fe9a676ca2dcc87a71d38308ff297c9a6cd249..d8d963f12dd93ad623eb2004f7a97892382d00c3 100644 (file)
--- a/test/walrestart.test
+++ b/test/walrestart.test
@@ -58,7 +58,7 @@ proc faultsim {n} {
   return 0
 }
 sqlite3 db2 test.db
-do_execsql_test 1.3 {
+do_execsql_test 1.2 {
   PRAGMA wal_checkpoint;
 } {0 45 0}