Avoid attempting to delete the journal file of a temporary pager when closing the...

FossilOrigin-Name: de8b87d65a85c4dabe53281092d9a23555a8e2d6

diff --git a/manifest b/manifest
index a74c840234b1ca0cdc9320844adb93bbe08bef09..03cf2c532009e28332e3b7795ac0b38a409e949d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sxGetLastError()\smember\sfunction\sto\sthe\ssqlite3_vfs\sstructure.\sIt\sis\sneither\scalled\snor\simplemented\sat\sthis\spoint.\s(CVS\s5192)
-D 2008-06-06T15:49:30
+C Avoid\sattempting\sto\sdelete\sthe\sjournal\sfile\sof\sa\stemporary\spager\swhen\sclosing\sthe\spager.\sIt\swill\sbe\sdeleted\sautomatically\sby\sthe\sOS\slayer.\s(CVS\s5193)
+D 2008-06-06T16:14:02
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ce92ea8dc7adfb743757794f51c10d1b0d9c55e4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -133,7 +133,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c 1578149e21c4eac42c7f230a6f40500846f8e781
 F src/os_unix.c 47936aee8265e482faa626141d97d896aa981ef4
 F src/os_win.c 0d975b131b2b104d6d69d9f16bdf3c8cec28e81d
-F src/pager.c b07ae2a2b9800250064ab487ef704a67c7fb5c9d
+F src/pager.c 1f3e20af0d027fefe6a09c4d00249abe7800d929
 F src/pager.h 7b1de4bf2cf2d9b7b312e6ed5bc7fcc9ba9aa2a4
 F src/parse.y 8c2c3145eebe1964eb279cb3c4e502eae28bb0fa
 F src/pragma.c 70e7c865dce85fdf9df81848af2169009a56ed08
@@ -591,7 +591,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c c65494ca99d1e09c246dfe37a7ca7a354af9990f
-P ef1956eebcaf5aca51af8c3b406b1fd4b1f391a7
-R 7ebcf59d214782c7eac008101f72d887
+P b8f1da52c303de20d40aa20a7a031728d5d69af5
+R 70316fa31416819576dd64c07a69ff7b
 U danielk1977
-Z b5f2d46790da62cb14651ece7247fa55
+Z 20131427c7a2cab6d1318e6133e00790

diff --git a/manifest.uuid b/manifest.uuid
index 0e68ee2465a68c7a336840b5885c52c35a122827..4e4b43d355b54e8e1ebbb9a2a856c689cfe31860 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8f1da52c303de20d40aa20a7a031728d5d69af5
\ No newline at end of file
+de8b87d65a85c4dabe53281092d9a23555a8e2d6
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index c37a755590e8e6888409d7f492c319004d97f0b6..9ee380a0ab12573b184265dbc15f2d0c95c449b3 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.453 2008/06/06 11:11:26 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.454 2008/06/06 16:14:02 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1426,7 +1426,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
     }else{
       sqlite3OsClose(pPager->jfd);
       pPager->journalOpen = 0;
-      if( rc==SQLITE_OK ){
+      if( rc==SQLITE_OK && !pPager->tempFile ){
         rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
       }
     }