Make sure the page size in crash6.test does not exceed the maximum

configured page size. (CVS 5003)

FossilOrigin-Name: 36b6610b25997074f398a2f2ddcdd6ace8c83fba

diff --git a/manifest b/manifest
index 79112ac2195cb024750b89e5c46728f4d45aa351..356282e691975c9500690026ff3f15b3d5c95916 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Free\sMem.z\sbuffers\swhen\sa\svdbe\sstatement\sis\sreset.\s(CVS\s5002)
-D 2008-04-14T15:15:23
+C Make\ssure\sthe\spage\ssize\sin\scrash6.test\sdoes\snot\sexceed\sthe\smaximum\nconfigured\spage\ssize.\s(CVS\s5003)
+D 2008-04-14T15:27:19
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -246,7 +246,7 @@ F test/crash2.test 26d7a4c5520201e5de2c696ea51ab946b59dc0e9
 F test/crash3.test 0b09687ae1a3ccbcefdfaeb4b963e26e36255d76
 F test/crash4.test 02ff4f15c149ca1e88a5c299b4896c84d9450c3b
 F test/crash5.test c7ddcf7ca83abc19901b977732144234ac72a938
-F test/crash6.test 873d851c5ba2a46e0f9974c54e1d4a77d9a587d5
+F test/crash6.test 9c730cf06335003cb1f5cfceddacd044155336e0
 F test/crash7.test e20a7b9ee1d16eaef7c94a4cb7ed2191b4d05970
 F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/createtab.test 199cf68f44e5d9e87a0b8afc7130fdeb4def3272
@@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P b8bc5f3a83408375cfbff90e2c574fb8996dfbd9
-R db8c293aa09600c96ac4c3e529b1a93d
-U danielk1977
-Z 57ccd5b8d61ec4e5dd551ec146834ef4
+P 0bedbe092aa3079dc49157a9bcaa7716b00e0bdb
+R 48563ba260846cbb1efc0fd56277115e
+U drh
+Z 4a14a73e6a540d19a16ebc886fe2e0c7

diff --git a/manifest.uuid b/manifest.uuid
index 1c7caf57de060820ca59a800759f633798ab0e8d..427c726a8eb2f018f5ce3d4f00a055c756b57712 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0bedbe092aa3079dc49157a9bcaa7716b00e0bdb
\ No newline at end of file
+36b6610b25997074f398a2f2ddcdd6ace8c83fba
\ No newline at end of file

diff --git a/test/crash6.test b/test/crash6.test
index 1ebad58f420972b8ae806e1096f2532909d56f4e..d5ee439f8c993c7a1906364a9fb847bf22d65e8e 100644 (file)
--- a/test/crash6.test
+++ b/test/crash6.test
@@ -11,7 +11,7 @@
 # This file tests that rollback journals for databases that use a 
 # page-size other than the default page-size can be rolled back Ok.
 #
-# $Id: crash6.test,v 1.1 2008/03/20 04:45:49 danielk1977 Exp $
+# $Id: crash6.test,v 1.2 2008/04/14 15:27:19 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -70,6 +70,9 @@ for {set ii 0} {$ii < 30} {incr ii} {
   sqlite3 db test.db
 
   set pagesize [expr 1024 << ($ii % 4)]
+  if {$pagesize>$::SQLITE_MAX_PAGE_SIZE} {
+    set pagesize $::SQLITE_MAX_PAGE_SIZE
+  }
   do_test crash6-3.$ii.0 {
     execsql "pragma page_size = $pagesize"
     execsql "pragma page_size"