Remove an unreachable condition from pager.c.

FossilOrigin-Name: 3628e86bf131cb205f08a4b299d84007cd6b25c3

diff --git a/manifest b/manifest
index 3d3492ec7c886221f8f1eb55a9503e511e11529b..767726d357af392c0aa0f6b731244bb8c5e3d211 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\ssend\sthe\sSQLITE_FCNTL_MMAP_LIMIT\spragma\sto\sthe\sVFS,\seven\sif\sthe\slimit\nis\szero\sand\seven\sif\sthe\sVFS\sdoes\snot\ssupport\sxFetch().
-D 2013-04-02T00:15:23.044
+C Remove\san\sunreachable\scondition\sfrom\spager.c.
+D 2013-04-02T00:41:18.590
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h ae08bcc5f6ec6b339f4a2adf3931bb88cc14c3e4
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d136eca0cff2f8a5ac2f45867d5e5153d60e377c
 F src/os_win.c a2f41c9dfb9b065285ba94d4a40a31ca2e2b6ea3
-F src/pager.c 95e7a64bfdd244603d595b455f4e9ef6cf124b54
+F src/pager.c 37ac3175cb46bf4eba5c23005c49700b33ed2dbe
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1040,7 +1040,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 8198cdd8ac5dcc1c677fffa869ac965186b96abf
-R a603a97de401ee9321fd272228a03ad0
+P 01ffdabbad30f1c157f2b33b1e85ee4d6c4632dd
+R 683cfbd9fb419480e60db9265a2009fc
 U drh
-Z 4afc43008f65fbdcf2b0b7902c3ce20b
+Z c53b9215e567f2251d489b56e620483a

diff --git a/manifest.uuid b/manifest.uuid
index 4e3c99ee29e7b6cbdf9cdbf0c7542a026121560a..cd77251101d89b6f9be72e6d5e8041e096e2883f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01ffdabbad30f1c157f2b33b1e85ee4d6c4632dd
\ No newline at end of file
+3628e86bf131cb205f08a4b299d84007cd6b25c3
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index e391652f48886a2ac0e16d18775aa440160afd3b..75d12cdc1eb4fca1bba355e50d4617aef0585cd3 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -2936,15 +2936,14 @@ static int pagerUndoCallback(void *pCtx, Pgno iPg){
   Pager *pPager = (Pager *)pCtx;
   PgHdr *pPg;
 
+  assert( pagerUseWal(pPager) );
   pPg = sqlite3PagerLookup(pPager, iPg);
   if( pPg ){
     if( sqlite3PcachePageRefcount(pPg)==1 ){
       sqlite3PcacheDrop(pPg);
     }else{
       u32 iFrame = 0;
-      if( pagerUseWal(pPager) ){
-        rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
-      }
+      rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
       if( rc==SQLITE_OK ){
         rc = readDbPage(pPg, iFrame);
       }