From: dan <dan@noemail.net>
Date: Fri, 13 Jan 2012 14:50:29 +0000 (+0000)
Subject: Do not throw an error from within test_journal.c if a database file size is not an... 
X-Git-Tag: version-3.7.10~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=961e4ca413272dfb5be1cf8e92abc58931d7b1f4;p=thirdparty%2Fsqlite.git

Do not throw an error from within test_journal.c if a database file size is not an integer multiple of the page-size.

FossilOrigin-Name: 3f4899a923f06d48edf6eeeb1c52b01958779efc
---

diff --git a/manifest b/manifest
index 3b036090b7..94b2bd91ea 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\stest\sfile\szerodamage.test\sfrom\sthe\sinmemory_journal\spermutation.
-D 2012-01-13T10:51:52.976
+C Do\snot\sthrow\san\serror\sfrom\swithin\stest_journal.c\sif\sa\sdatabase\sfile\ssize\sis\snot\san\sinteger\smultiple\sof\sthe\spage-size.
+D 2012-01-13T14:50:29.345
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -211,7 +211,7 @@ F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
 F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
 F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
 F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
-F src/test_journal.c a70f1b79de153ba84179103ff9da16145e8ba8fc
+F src/test_journal.c a6a6baf343f79b942331f13378d045e7e270ae64
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
 F src/test_multiplex.c 67c210e2cdd63c4962c5cb20bd8fd2fd4d7a8410
@@ -987,7 +987,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 5afbcd49f92e13d1654c1486e19d7e1bb4d3b024
-R 2c209f0b268cc45af60c6c451fb28998
+P 0c0051b1a548591180e4b02f2e74a1a8a63318a3
+R b9914ff3f427bc835fd7127e1f4e42d4
 U dan
-Z ae3b5a93b365c297d7c74693399bd8ca
+Z 64cbd7ce630abf1ccfd450b8e38c5afa
diff --git a/manifest.uuid b/manifest.uuid
index 9601c3752b..c0c9d59d54 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c0051b1a548591180e4b02f2e74a1a8a63318a3
\ No newline at end of file
+3f4899a923f06d48edf6eeeb1c52b01958779efc
\ No newline at end of file
diff --git a/src/test_journal.c b/src/test_journal.c
index 70b863c259..00567db598 100644
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -409,6 +409,7 @@ static int openTransaction(jt_file *pMain, jt_file *pJournal){
         if( iOff==PENDING_BYTE ) continue;
         rc = sqlite3OsRead(pMain->pReal, aData, pMain->nPagesize, iOff);
         pMain->aCksum[ii] = genCksum(aData, pMain->nPagesize);
+        if( ii+1==pMain->nPage && rc==SQLITE_IOERR_SHORT_READ ) rc = SQLITE_OK;
       }
     }