Revise change from the previous check-in to clarify the situation when handling open...

FossilOrigin-Name: 1c318ef3b76e9a9a5ff2f156a9acddfc1bda0949

diff --git a/manifest b/manifest
index 88bbb69aa08fce8963128a4ff6bbf5eae1e052cf..9e997b1eb1f0cdf21c1ef3957a89b8b850a83513 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\scalling\ssqlite3OsDelete()\son\sa\sfile\sthat\sis\sopen,\ssince\sthis\scauses\sWindows\sto\srun\s*very*\sslowly.\s\sComes\sup\son\serror\srecovery\sin\sjournal_mode=PERSIST.
-D 2014-03-07T02:29:56.179
+C Revise\schange\sfrom\sthe\sprevious\scheck-in\sto\sclarify\sthe\ssituation\swhen\shandling\sopen\sjournal\sfiles,\sregardless\sof\sjournal\smode.
+D 2014-03-07T03:31:35.143
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -204,7 +204,7 @@ F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
 F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e
-F src/pager.c f5805e0e8c271d37e812402c98b50b9bfb1b196b
+F src/pager.c ab9b5331e402f438effb02575955ffea673246cd
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
 F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
@@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P c0d54b4e41cba84dc5934e0fcd03fe422fe5c92b
-R 8e1ba1c1988955cecc40c9b987fa270a
+P fdc651e2ec7a0babee669e24fd56632e7cd5f0e9
+R dd6c54a8aa52f6e2a8e41a668b913ede
 U mistachkin
-Z a001c15cb2d0783379551661d5488666
+Z 7a2dfaabd9df7aaa8958f21cc25c2459

diff --git a/manifest.uuid b/manifest.uuid
index 28d5ef59d63fc43240e3f2f3d302c4ffc8c140be..13a19cc1e74d500b2d69e81112713941090ec8eb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdc651e2ec7a0babee669e24fd56632e7cd5f0e9
\ No newline at end of file
+1c318ef3b76e9a9a5ff2f156a9acddfc1bda0949
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 6a4746e340a7a09b7de58adb17eee40fe114322f..e2486caa0a094c3f51b988a7ad1ec3636d2bc9b9 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4897,7 +4897,7 @@ static int hasHotJournal(Pager *pPager, int *pExists){
       */
       rc = pagerPagecount(pPager, &nPage);
       if( rc==SQLITE_OK ){
-        if( nPage==0 && pPager->journalMode!=PAGER_JOURNALMODE_PERSIST ){
+        if( nPage==0 && !jrnlOpen ){
           sqlite3BeginBenignMalloc();
           if( pagerLockDb(pPager, RESERVED_LOCK)==SQLITE_OK ){
             sqlite3OsDelete(pVfs, pPager->zJournal, 0);