Add an ALWAYS() to an always-true conditional in the WAL rollback logic.

FossilOrigin-Name: c5eae8a60d474131fbfa4d0c2b459005267e8be4

diff --git a/manifest b/manifest
index d98c6b6486ed50a827ad34dcc143ef9ae881dd9c..e7e986f7fe1ad4e85d948d8cb56c1bc5b5ffbeec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\scode\sfrom\ssqlite3BtreeKeySize()\smade\sunreachable\sby\sthe\sprevious\ncheck-in.
-D 2014-11-17T20:33:07.735
+C Add\san\sALWAYS()\sto\san\salways-true\sconditional\sin\sthe\sWAL\srollback\slogic.
+D 2014-11-18T02:44:32.636
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -299,7 +299,7 @@ F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
-F src/wal.c 73051f1222321712fa4280c495780ba81d302dad
+F src/wal.c 095d41f7114d7a8699207f5313488aa88372d540
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
 F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
@@ -1205,7 +1205,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2f2ecb994889acb783616acb7307f8fed962d213
-R 3350d2f69701d38a07608c1007a483bc
+P 57c4aa988c8eda3cc513c1e5df5804d88bee99a0
+R f70435983903607c251f8514c7f3013d
 U drh
-Z df1a082a18c57f32c53583132171df67
+Z f0ae269a66dc8c4b111d5661661171ab

diff --git a/manifest.uuid b/manifest.uuid
index 2223a6ffff5a3fd74cbf0fd5f809723b0926cdcd..3ceeab2cdb3eb8f66d0ff6ebd16e20b2d762a17a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-57c4aa988c8eda3cc513c1e5df5804d88bee99a0
\ No newline at end of file
+c5eae8a60d474131fbfa4d0c2b459005267e8be4
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 24540a2cd5ddf979672c04c5088d1cd7bf0df107..d134a8b52a31089b555ada725aa259c94646286c 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2506,7 +2506,7 @@ int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *pUndoCtx){
     memcpy(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr));
 
     for(iFrame=pWal->hdr.mxFrame+1; 
-        rc==SQLITE_OK && iFrame<=iMax; 
+        ALWAYS(rc==SQLITE_OK) && iFrame<=iMax; 
         iFrame++
     ){
       /* This call cannot fail. Unless the page for which the page number