Fix an issue with the previous check-in, (6929). (CVS 6930)

FossilOrigin-Name: e5165c80abfdba0ad74e1042e4c94fe00d4b3308

diff --git a/manifest b/manifest
index 900ecd2f8d74f92da43a26253f4b02e0bfc958e1..32378beeb4487f3e00843235d1481c4d762cf651 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\ssimplifications\sto\spager.c\sin\ssupport\sof\sstructural\scoverage\stesting.\s(CVS\s6929)
-D 2009-07-24T19:01:19
+C Fix\san\sissue\swith\sthe\sprevious\scheck-in,\s(6929).\s(CVS\s6930)
+D 2009-07-24T21:23:16
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
-F src/pager.c 1ad2dff309c92fbf0a7a2017ece5407d05b19937
+F src/pager.c e71458a9fff80fd54589f7566dd3b85434814c43
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 5d9e767a05e381235e064061043e30cc03a11a07
-R 22fe9f29fb6a7ee66218964085f3f2ec
+P 866216c0b6ba23b66483046fb402ddbe4f9a7b14
+R f0f2c963235ce625a4a037d3c6a52b51
 U drh
-Z 2136ce2091cca0331400af0c4f963123
+Z 1f9c03c3abcdedba3e2389b156b0c0c2

diff --git a/manifest.uuid b/manifest.uuid
index 189d2365080f12129de3c196ad288cb666b8e3ab..ee199f9f401c212ddd78193ad877d118cbb6105b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-866216c0b6ba23b66483046fb402ddbe4f9a7b14
\ No newline at end of file
+e5165c80abfdba0ad74e1042e4c94fe00d4b3308
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 43b44c8f2226a8367156841b26b96ace07ea3fe5..8340f749f89314fbc4c05cefd2050788533dc169 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.616 2009/07/24 19:01:19 drh Exp $
+** @(#) $Id: pager.c,v 1.617 2009/07/24 21:23:16 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3414,7 +3414,7 @@ static int hasHotJournal(Pager *pPager, int *pExists){
   int exists;                   /* True if a journal file is present */
 
   assert( pPager!=0 );
-  assert( useJournal );
+  assert( pPager->useJournal );
   assert( isOpen(pPager->fd) );
   assert( !isOpen(pPager->jfd) );
 
@@ -3512,7 +3512,7 @@ static int readDbPage(PgHdr *pPg){
   assert( pPager->state>=PAGER_SHARED && !MEMDB );
   assert( isOpen(pPager->fd) );
 
-  if( !isOpen(pPager->fd) ){
+  if( NEVER(!isOpen(pPager->fd)) ){
     assert( pPager->tempFile );
     memset(pPg->pData, 0, pPager->pageSize);
     return SQLITE_OK;