Remove a c++ comment in pager.c. (CVS 3730)

FossilOrigin-Name: e4452e8aede9282feaeeac19d0cdf82b01c3cc19

diff --git a/manifest b/manifest
index 21038e73d5d19a565c8e17cf12584a7e717c375d..1162d785fbe8f28a68b5bb67ddff2a3324af5090 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\shandling\sof\sIO\serrors\sthat\soccur\sin\sOsDelete()\sor\sOsTruncate()\soperations.\sAlso\suse\san\sanonymous\sfile\sfor\stemporary\sstorage\sduring\sa\sVACUUM.\s(CVS\s3729)
-D 2007-03-27T16:19:52
+C Remove\sa\sc++\scomment\sin\spager.c.\s(CVS\s3730)
+D 2007-03-27T17:37:32
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -86,7 +86,7 @@ F src/os_unix.c 0d91b28d57c0885fe97fb9020fd1091578066b5b
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 84c02837a6ec216a07e83a1d10d5a01c417bb489
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 2cc40af071948f6e57eb042f3a99a8921931effc
+F src/pager.c 444a49c2fa0a4d84d2877633865e1d5bc138ef57
 F src/pager.h f1b17bf848b3dce5d9afb2701186d3c9a8826f8c
 F src/parse.y 207ab04273ae13aa4a729b96008d294d5f334ab3
 F src/pragma.c 9cb8b94e7d38ba35a86037bd517d07ba9870b4b2
@@ -442,7 +442,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P c61c97c978dab7535c94033631f5ad2355c55057
-R 0bc45e4cb76bfeab2e890a743828ed44
+P b24a6e7b024c8b9a0b6fd15bd8f247e458781ca2
+R 85a141c655cfa77f865d002976eceebf
 U danielk1977
-Z 0cef8b7fd227f96700de124998af2737
+Z ca732204acf796445632fba67084a5c5

diff --git a/manifest.uuid b/manifest.uuid
index 5c15326457cf8d0a9378e833ef2f8cd65da0b074..1b41c960da9d2f881576ac9a057e1aef0ac505d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b24a6e7b024c8b9a0b6fd15bd8f247e458781ca2
\ No newline at end of file
+e4452e8aede9282feaeeac19d0cdf82b01c3cc19
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 16c921a4a0bffe223f752460be96dbc0763d181e..9509cd9b727b4848983e6bd93426e9a9dd8faa06 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.302 2007/03/27 16:19:52 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.303 2007/03/27 17:37:32 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3027,8 +3027,7 @@ int sqlite3PagerUnref(DbPage *pPg){
     */
     pPager->nRef--;
     assert( pPager->nRef>=0 );
-    // assert( pPager->nRef>0 || !pPager->journalOpen || pPager->journalOff==0 );
-    if( pPager->nRef==0 && !pPager->exclusiveMode ){
+    if( pPager->nRef==0 && (!pPager->exclusiveMode || pPager->journalOff>0) ){
       pagerUnlockAndRollback(pPager);
     }
   }