From 5761dbe4a36a768310e402393113e20d36d46db4 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Thu, 5 Aug 2010 16:08:26 +0000
Subject: [PATCH] Catch an error code that was not being propagated back to the
 caller.

FossilOrigin-Name: 800f496929fb0d45d16c573c5dca0197ac922e2b
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/pager.c   |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 406d746d4a..24129bb6ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sfor\serror\shandling\swith\stemp\sdatabases.\sAnd\sfor\serrors\sthat\soccur\swithin\sOS\slocking\sprimitives.
-D 2010-08-05T15:30:22
+C Catch\san\serror\scode\sthat\swas\snot\sbeing\spropagated\sback\sto\sthe\scaller.
+D 2010-08-05T16:08:26
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +156,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
-F src/pager.c c09ca0cf83f928f0299be6620322acd9c38fa3ce
+F src/pager.c 7232578996c9ecd7b57bb9952a81549f2f133a4b
 F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -842,7 +842,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 77eaab6f77c53cc4f429b65dfcf287ad6084c2da
-R 002859c356edc1f0f7f124dc9ba8ad0d
+P f99a902f9b3d0bf6f607c4ba641b4096fbbef5d5
+R 619c44a049e165e5bdd234c179e111ef
 U dan
-Z f6fbebc4624605af3301d8eb4f042add
+Z 4f4c91f530cb0822ccee88049df426ee
diff --git a/manifest.uuid b/manifest.uuid
index aab1319941..21086831e8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f99a902f9b3d0bf6f607c4ba641b4096fbbef5d5
\ No newline at end of file
+800f496929fb0d45d16c573c5dca0197ac922e2b
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index ac172c6ae2..cbbce3ff0a 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -3615,6 +3615,7 @@ static int syncJournal(Pager *pPager, int newHdr){
       if( newHdr && 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
         pPager->nRec = 0;
         rc = writeJournalHdr(pPager);
+        if( rc!=SQLITE_OK ) return rc;
       }
     }else{
       pPager->journalHdr = pPager->journalOff;