Improved testability.

FossilOrigin-Name: e83d3a2a4e06665e8a056f63063bd6df03f063b9

diff --git a/manifest b/manifest
index fad33f874f648e110b4e8893cbe0094cc0484f11..fb39c5119cb04f77bbf713d6d60ef1c8ad83d486 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C All\sWAL\sframe\soverwrites\seven\sif\sthere\sare\sactive\ssavepoints.\s\sThis\sis\ssafe\nbecause\sa\sROLLBACK\sTO\swill\scause\sall\sreverted\spages\sto\sbe\srewritten\sto\sthe\nWAL\sfile\sprior\sto\sCOMMIT.
-D 2016-01-09T23:55:47.044
+C Improved\stestability.
+D 2016-01-11T00:52:32.218
 F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@ -409,7 +409,7 @@ F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
 F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
 F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
 F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
-F src/wal.c e1f55f68a7b512c5f6dc5059ca45474442b295ea
+F src/wal.c 92ca9e7923c337c497e4c9aa7edac800e269a1d8
 F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
 F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
@@ -1407,7 +1407,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 16b34f2537bbc7846d8e6dc2b35daae5af241c1b
-R 7a7df63cdc3481fc553f1ad7c8a16e77
+P 99b31a6b491c1c51227f478d3713b020d37a17cf
+R d76e78fad37168874a95f2cf1af1f963
 U drh
-Z 48de22511c800e5231d6beb3d37133dd
+Z b9a236105d87275bc956baaa16673a98

diff --git a/manifest.uuid b/manifest.uuid
index bb0195b3065bc3db8d0dfa7ffd166cc34941059b..23e6efc988ecc23731047754f00cdec4d3979de8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99b31a6b491c1c51227f478d3713b020d37a17cf
\ No newline at end of file
+e83d3a2a4e06665e8a056f63063bd6df03f063b9
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 492e2a1dbcfe271519db9ff58a6a3358e8f21ea6..ae6a54849a8c2e68a614539314d326b17ccab886 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -3056,8 +3056,8 @@ int sqlite3WalFrames(
     ** checksums must be recomputed when the transaction is committed.  */
     if( iFirst && (p->pDirty || isCommit==0) ){
       u32 iWrite = 0;
-      rc = sqlite3WalFindFrame(pWal, p->pgno, &iWrite);
-      if( rc ) return rc;
+      VVA_ONLY(rc =) sqlite3WalFindFrame(pWal, p->pgno, &iWrite);
+      assert( rc==SQLITE_OK || iWrite==0 );
       if( iWrite>=iFirst ){
         i64 iOff = walFrameOffset(iWrite, szPage) + WAL_FRAME_HDRSIZE;
         if( pWal->iReCksum==0 || iWrite<pWal->iReCksum ){