From: shaneh <shaneh@noemail.net>
Date: Thu, 7 Jan 2010 22:02:34 +0000 (+0000)
Subject: Minor tweaks to restore_jrnl.tcl utility script.
X-Git-Tag: version-3.7.2~654
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d61fa23290dd05ba7a7961267332cb8af99cc24f;p=thirdparty%2Fsqlite.git

Minor tweaks to restore_jrnl.tcl utility script.

FossilOrigin-Name: b97aca1200d959a1e7c08dd4e9dbce4724342119
---

diff --git a/manifest b/manifest
index af206f0ae6..8721c80887 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\stool\sthat\sattempts\sto\srepair\sa\sjournal\sheader.
-D 2010-01-07T21:49:48
+C Minor\stweaks\sto\srestore_jrnl.tcl\sutility\sscript.
+D 2010-01-07T22:02:35
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -770,7 +770,7 @@ F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
-F tool/restore_jrnl.tcl f8ed56dbfa7d30fcb51ac0ea79a430928a42d1f4
+F tool/restore_jrnl.tcl 81dabc8951580e0983ea867631be855dc93358ce
 F tool/shell1.test ef08a3e738b9fee4fc228920956950bc35db0575
 F tool/shell2.test 91824fff77514b6b00227744c475c09c34134a4e
 F tool/shell3.test ff663e83100670a295d473515c12beb8103a78b6
@@ -785,7 +785,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 44bb1bfe5dedd8054ddd933941ee4112ed8d3b68
-R 80d6fe28fe35c61c732f56f7d98c7c79
+P 05b18b5f6a38f513ff49656faada725eb44715b7
+R 99c2a9dd26b7b50e819f5bcbbba2a04f
 U shaneh
-Z d814ae1179cd7f19acd5f1901fe58bc2
+Z 2f756cb564fe45590ccd32f9d897b68c
diff --git a/manifest.uuid b/manifest.uuid
index 9a3b712554..ecfbe66b43 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05b18b5f6a38f513ff49656faada725eb44715b7
\ No newline at end of file
+b97aca1200d959a1e7c08dd4e9dbce4724342119
\ No newline at end of file
diff --git a/tool/restore_jrnl.tcl b/tool/restore_jrnl.tcl
index b791f63636..66ec279dab 100644
--- a/tool/restore_jrnl.tcl
+++ b/tool/restore_jrnl.tcl
@@ -76,8 +76,12 @@ set db_pgsz [db eval {PRAGMA page_size}]
 db close
 set db_npage [expr {$db_fsize / $db_pgsz}]
 
+# restore in case get the page_size above changed things
+copy_file $db_name.org $db_name
+copy_file $jrnl_name.org $jrnl_name
+
 # calculate checksum nonce
-set pgno 1
+set pgno 0
 set pg_offset [expr $sectsz+((4+$db_pgsz+4)*$pgno)]
 set nonce [hexio_get_int [hexio_read $jrnl_name [expr $pg_offset+4+$db_pgsz] 4]]
 for {set i [expr $db_pgsz-200]} {$i>0} {set i [expr $i-200]} {
@@ -107,6 +111,6 @@ hexio_write $jrnl_name 24 [format %08x $db_pgsz]
 sqlite3 db $db_name
 do_test restore_jrnl-1.0 {
   catchsql {PRAGMA integrity_check}
-} {0 {ok}}
+} {0 ok}
 
 db close