Update test_journal.c to account for (6817). Changes to test code only. (CVS 6818)

FossilOrigin-Name: 542ee8cced2a37095808d8baf5002dc66f4a64d6

diff --git a/manifest b/manifest
index 7a5ca50dcc27a1a7521f195660f86743b92e3a51..4eac77ea18b7796173fea9f81b2f4f3128691ac3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\swriting\sthe\s8-byte\sjournal-header\smagic\suntil\sthe\sjournal-header\sis\ssynced.\sIn\spersistent\sjournal-mode,\sthis\sprevents\sany\sold\scontent\sthat\sfollows\san\sunsynced\sjournal-header\sfrom\sbeing\sinterpreted\sas\spart\sof\sthe\srollback\sjournal.\s(CVS\s6817)
-D 2009-06-26T07:12:07
+C Update\stest_journal.c\sto\saccount\sfor\s(6817).\sChanges\sto\stest\scode\sonly.\s(CVS\s6818)
+D 2009-06-26T09:01:28
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -184,7 +184,7 @@ F src/test_config.c 63d1b08809ca182ee75429573111b44735861c64
 F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
 F src/test_func.c b8140bc4ed0d290d5e22972eb2a3bfd40aa798dc
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
-F src/test_journal.c 28673a22c9cf5d258c153b788340fa1e1ec40b8b
+F src/test_journal.c de9b1c132fa7b81b40ddba1e1cc219cfa7f71593
 F src/test_loadext.c 97dc8800e46a46ed002c2968572656f37e9c0dd9
 F src/test_malloc.c c3aabe4b48d1f4f1e78b6561ce92ca04b7495ee5
 F src/test_md5.c 032ae2bb6f81da350d2404e81fa8d560c8268026
@@ -737,7 +737,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P bb5f1c01435dcc1ea056f0d149f750fa7812f652
-R 383a763ea1f6b28e78c47a340c8dfba5
+P a5ecffcf025da2fcb241e83c7bebc1095a3b51d6
+R c676cf0f55e46f711692cbb781213a1a
 U danielk1977
-Z f3d299840c7ab8a7d6b950df9de8e6fa
+Z afb621a0d984d29cdcb0c1a658c4dfbf

diff --git a/manifest.uuid b/manifest.uuid
index 872627d0abc972eed723cc79dd29be34424c6ffb..539a3f2c68bf33d7ee2e954d830774c4fa78b9d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a5ecffcf025da2fcb241e83c7bebc1095a3b51d6
\ No newline at end of file
+542ee8cced2a37095808d8baf5002dc66f4a64d6
\ No newline at end of file

diff --git a/src/test_journal.c b/src/test_journal.c
index 9b362879f6c3da1fd47851a23e7800ae4274e07e..d5fd5da68c6d357b13a694868df46bb13107c96a 100644 (file)
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -15,7 +15,7 @@
 ** correctly populates and syncs a journal file before writing to a
 ** corresponding database file.
 **
-** $Id: test_journal.c,v 1.15 2009/04/07 11:21:29 danielk1977 Exp $
+** $Id: test_journal.c,v 1.16 2009/06/26 09:01:28 danielk1977 Exp $
 */
 #if SQLITE_TEST          /* This file is used for testing only */
 
@@ -420,14 +420,17 @@ static int jtWrite(
       jt_file *pMain = locateDatabaseHandle(p->zName);
       assert( pMain );
   
-      if( decodeJournalHdr(zBuf, 0, &pMain->nPage, 0, &pMain->nPagesize) ){
+      if( iAmt==28 ){
         /* Zeroing the first journal-file header. This is the end of a
         ** transaction. */
         closeTransaction(pMain);
-      }else{
+      }else if( iAmt!=12 ){
         /* Writing the first journal header to a journal file. This happens
         ** when a transaction is first started.  */
         int rc;
+        u8 *z = (u8 *)zBuf;
+        pMain->nPage = decodeUint32(&z[16]);
+        pMain->nPagesize = decodeUint32(&z[24]);
         if( SQLITE_OK!=(rc=openTransaction(pMain, p)) ){
           return rc;
         }