Mark an unreachable branch in the recent WAL problem as unreachable.

FossilOrigin-Name: 3e8a29ff8953054cb3b88db5997b5bae38ba09dd

diff --git a/manifest b/manifest
index 661fb78b3c2586a7267b7df54b5ed1fee9cb706d..4ded5d5da8b412a747c95c0446bc18d53e3b960f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\stest\sfor\s[2d1a5c67df].
-D 2011-05-19T07:53:23.122
+C Mark\san\sunreachable\sbranch\sin\sthe\srecent\sWAL\sproblem\sas\sunreachable.
+D 2011-05-20T01:49:30.995
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 6d4a58d81ad4b782406519f3790202f330e89bb7
 F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230
-F src/pager.c 4b2358556c88660a94a4560de95dd728911e00fd
+F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
@@ -938,7 +938,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 67bf1c9a888b0d84d252d6c4c754c2c51994d208
-R 84c84662daf4fcfa430ab94eb0e5302f
-U dan
-Z b2a115bcb644bb929ad33751c5f52805
+P 97fcd9e88891abd44037004e47862bcecfa1b0c9
+R dfc39482dc1485cfb422ba7a47f95a18
+U drh
+Z 170a5ac08de306ec947114fc9ba724a8

diff --git a/manifest.uuid b/manifest.uuid
index f2ab280f7f8ad6b971974bce7f903ead36285285..e36365ca26e29896e407578c5045be31cf60d553 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-97fcd9e88891abd44037004e47862bcecfa1b0c9
\ No newline at end of file
+3e8a29ff8953054cb3b88db5997b5bae38ba09dd
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 6bddd7fd1f4ba4e48bb174fb131893f9f58f93ff..7ff9a9a000aaaa21041910a0d28f4fe572f3068b 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -5755,8 +5755,8 @@ int sqlite3PagerCommitPhaseOne(
         pList = pPageOne;
         pList->pDirty = 0;
       }
-      assert( pList!=0 || rc!=SQLITE_OK );
-      if( pList ){
+      assert( rc==SQLITE_OK );
+      if( ALWAYS(pList) ){
         rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1, 
             (pPager->fullSync ? pPager->syncFlags : 0)
         );