If an error occurs in PagerBegin(), call pager_end_transaction() to reset the interna...

FossilOrigin-Name: ea7ed16628da29cf4a127a25cbac8ae553e2ac1f

diff --git a/manifest b/manifest
index de5b765911a63af6412046cd6ac324178185cfb3..e2cccad03170420ec64988c960f6510d3da19569 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sreference\scount\sproblem\sfollowing\sdatabase\scorruption\sdetection\sin\nthe\sptrmapPut()\sroutine\sof\sbtree.c.\s(CVS\s6854)
-D 2009-07-07T11:39:59
+C If\san\serror\soccurs\sin\sPagerBegin(),\scall\spager_end_transaction()\sto\sreset\sthe\sinternal\sstate\sof\sthe\spager\sobject.\s(CVS\s6855)
+D 2009-07-07T13:56:24
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
-F src/pager.c 18b9bfe88c21873f7bc10600685c74dd23b1ed30
+F src/pager.c 164c5b0160203d7fd26ad27bd168dff90f0f122a
 F src/pager.h 5aec418bf99f568b92ae82816a1463400513726d
 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
 F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d
@@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P fc2a40a9db23285da16f40f5131613907fb80f02
-R 067e52bffc46b1e850298e3bb4524f93
-U drh
-Z fdbf1e48a2965ae7334046f98d17d69c
+P ec1e27e33b89e809a03e4140b351f6c8674c0233
+R e28c07bc21fb6fc8bda63e0e4a6adcc7
+U danielk1977
+Z 890ee77caf3f4dd632bdc59421b0f5cb

diff --git a/manifest.uuid b/manifest.uuid
index ecce359e4dfd4b26d51c2f27fe1564b62a9be127..89d5b03104bc7dae8dfc4de4f5304fe32b1fa275 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec1e27e33b89e809a03e4140b351f6c8674c0233
\ No newline at end of file
+ea7ed16628da29cf4a127a25cbac8ae553e2ac1f
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index bdc085607df42faa4fb0fcce577e3a99ef9d443f..e7c4e21310dfb8fa115352d6d66f96b4b01cb23c 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.604 2009/07/06 21:54:41 drh Exp $
+** @(#) $Id: pager.c,v 1.605 2009/07/07 13:56:24 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -4166,6 +4166,15 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
 
   PAGERTRACE(("TRANSACTION %d\n", PAGERID(pPager)));
   assert( !isOpen(pPager->jfd) || pPager->journalOff>0 || rc!=SQLITE_OK );
+  if( rc!=SQLITE_OK ){
+    assert( !pPager->dbModified );
+    /* Ignore any IO error that occurs within pager_end_transaction(). The
+    ** purpose of this call is to reset the internal state of the pager
+    ** sub-system. It doesn't matter if the journal-file is not properly
+    ** finalized at this point (since it is not a valid journal file anyway).
+    */
+    pager_end_transaction(pPager, 0);
+  }
   return rc;
 }