A proported fix for ticket #374. (CVS 1047)

FossilOrigin-Name: a49ee69e98df80b479aa6bb97a9af9c6abf04e3f

manifest

@@ -1,5 +1,5 @@
-C Update\sthe\sNULL-handling\sdocument\sto\sshow\scurrent\sbehavior\sof\sOCELOT.\s(CVS\s1046)
-D 2003-07-07T00:10:40
+C A\sproported\sfix\sfor\sticket\s#374.\s(CVS\s1047)
+D 2003-07-07T10:47:10
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -37,7 +37,7 @@ F src/main.c 1bfd1bfed2d8d242579ec9bd0425a9e8e3bef64d
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c 0d5252d60c1b0f21a343b18248d3dfcafb94e621
 F src/os.h 9e5bbddff123187295e3d00d49af06192cd1cd49
-F src/pager.c 6c50e8dc861bb08f8c52b1fe9aabef6554d61c95
+F src/pager.c 9512e789dbd5acaf91e74c4665e03c2734d3da25
 F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
 F src/parse.y 917250e5d86bdee752355e6617ea2e8ee12438bf
 F src/pragma.c 3b4f5a800e7a2145bc1930f323232e297d4eb782
@@ -168,7 +168,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 982aa3356bcc217003cd9e6a829619219c334797
-R 5b70a86c3000b6c8ddc166ce19c2041e
+P 1d4c92c7325f69ee84b901a2de74a306ace134b6
+R 98f295873ba2a9a8b9e49e8059d2a1d4
 U drh
-Z 72ccf7d5146876d033c3e7ec8d5fed3c
+Z 1caec2ad5fd7972fd1f54511299aff27

manifest.uuid

@@ -1 +1 @@
-1d4c92c7325f69ee84b901a2de74a306ace134b6
+a49ee69e98df80b479aa6bb97a9af9c6abf04e3f

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.85 2003/06/14 11:42:58 drh Exp $
+** @(#) $Id: pager.c,v 1.86 2003/07/07 10:47:10 drh Exp $
 */
 #include "os.h"         /* Must be first to enable large file support */
 #include "sqliteInt.h"
@@ -1520,6 +1520,7 @@ static int pager_open_journal(Pager *pPager){
   assert( pPager->state==SQLITE_WRITELOCK );
   assert( pPager->journalOpen==0 );
   assert( pPager->useJournal );
+  sqlitepager_pagecount(pPager);
   pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 );
   if( pPager->aInJournal==0 ){
     sqliteOsReadLock(&pPager->fd);
@@ -1539,7 +1540,6 @@ static int pager_open_journal(Pager *pPager){
   pPager->needSync = 0;
   pPager->alwaysRollback = 0;
   pPager->nRec = 0;
-  sqlitepager_pagecount(pPager);
   if( pPager->errMask!=0 ){
     rc = pager_errcode(pPager);
     return rc;