Add a comment to the openSubjournal() function in pager.c. (CVS 6130)

FossilOrigin-Name: 04387ae10ab3be24c93497f4af6f48d6832f37eb

diff --git a/manifest b/manifest
index fc7c841213ac416adfbd6e6030bb3d2547a60764..9519a7d2d6cbe59106d4b127650312f5a2699a54 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sreverting\sa\s'DROP\sTABLE'\scommand\sexecuted\sinside\sof\sa\ssavepoint\son\san\sauto-vacuum\sdatabase.\s(CVS\s6129)
-D 2009-01-07T10:35:19
+C Add\sa\scomment\sto\sthe\sopenSubjournal()\sfunction\sin\spager.c.\s(CVS\s6130)
+D 2009-01-07T10:52:56
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -142,7 +142,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c e6eacc7ec735ded605fefcbaf250058baa8feb12
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
-F src/pager.c 59a70fae1d6594734c652ad33c97afd9ebc29268
+F src/pager.c 1af21dadcfea3050b34ec54a5a173da368e13e10
 F src/pager.h 0793c5e4faed6c278037eb22b2434b318687d615
 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
@@ -692,7 +692,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e5d42c69a3b325ca12f53184e33964230acbdd1f
-R a5a8625aaf9e409d433ca7b188e79539
+P 3a4bb83235e9a79297e7d5d47ac7674c9df960bf
+R 69328c811bc9ff20117c3aeb0aaeffc8
 U danielk1977
-Z de63ae952f3922615c231e9860293c66
+Z 001298448438542bba82708599474b69

diff --git a/manifest.uuid b/manifest.uuid
index a2524046cb42af6f5eac8355205682b6add9daaa..308f578a877fd273282b04755f321f8cc76f9183 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a4bb83235e9a79297e7d5d47ac7674c9df960bf
\ No newline at end of file
+04387ae10ab3be24c93497f4af6f48d6832f37eb
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 14776d44061915ebb87be1410e7f721f08a0aa7b..18800f82c883862e3a9870191526dbe5f077ae16 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.536 2009/01/07 10:35:19 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.537 2009/01/07 10:52:56 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3185,6 +3185,15 @@ int sqlite3PagerUnref(DbPage *pPg){
   return SQLITE_OK;
 }
 
+/*
+** If the main journal file has already been opened, ensure that the
+** sub-journal file is open too. If the main journal is not open,
+** this function is a no-op.
+**
+** SQLITE_OK is returned if everything goes according to plan. An 
+** SQLITE_IOERR_XXX error code is returned if the call to 
+** sqlite3OsOpen() fails.
+*/
 static int openSubJournal(Pager *pPager){
   int rc = SQLITE_OK;
   if( pPager->journalOpen && !pPager->sjfd->pMethods ){