Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: 7e068e39b3b31364271664e0afb1cd95a235c26f

1 files changed, 8 insertions, 0 deletions

diff --git a/src/journal.c b/src/journal.c
index 06605cc95..fed27be3e 100644
--- a/src/journal.c
+++ b/src/journal.c
@@ -59,6 +59,14 @@ static int createFile(JournalFile *p){
         assert(p->iSize<=p->nBuf);
         rc = sqlite3OsWrite(p->pReal, p->zBuf, p->iSize, 0);
       }
+      if( rc!=SQLITE_OK ){
+        /* If an error occurred while writing to the file, close it before
+        ** returning. This way, SQLite uses the in-memory journal data to 
+        ** roll back changes made to the internal page-cache before this
+        ** function was called.  */
+        sqlite3OsClose(pReal);
+        p->pReal = 0;
+      }
     }
   }
   return rc;