Change savepoint4.test to limit database growth. Otherwise the test can take a very...

FossilOrigin-Name: ed1d4f47ee9a2bcafdee92ee6bfcb2b0d1758f76

diff --git a/manifest b/manifest
index 5c73c297524b3e7422f27783280649643282d3fc..dec4e1ba9043c0b65d79bd4034852a108ed88c4a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\smkkeywordhash.c\sso\sthat\sit\sputs\sthe\soriginal\stext\sof\seach\stoken\sin\na\scomment\sbeside\sthe\s"testcase()"\smacros.\s(CVS\s6736)
-D 2009-06-09T14:27:41
+C Change\ssavepoint4.test\sto\slimit\sdatabase\sgrowth.\sOtherwise\sthe\stest\scan\stake\sa\svery\slong\stime\sto\srun,\sdepending\son\sthe\sprng.\s(CVS\s6737)
+D 2009-06-09T15:25:33
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -517,7 +517,7 @@ F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
 F test/savepoint.test 4fc56354c7cd9c6be40d6f18e06ee90d92be0cd9
 F test/savepoint2.test 427c8b20f43d3edf17a290c6788ae9e2703ac51c
 F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
-F test/savepoint4.test b7de188c6584c943ca4c11e3f97e9333b14f6c9d
+F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 F test/savepoint6.test 2df1d093e59e78d688c64eb20e0457aaea7d08f9
 F test/schema.test deafe5472099ab5bc65748059dc5182fc8ebad74
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 56bff6eb2fc5f0afbd96afc986671ec744bd40e1
-R b6c6cb0746f9cab11932586981b7f888
-U drh
-Z f0c1b7aa48b811b9a2662ed5ac53ad57
+P a7d0817c176832a88788cc973c0aae8dcab57364
+R 4eac5e8fb9c97abd8918163578f59db1
+U danielk1977
+Z 77827a69ee99e1935bb3859a0a751a0e

diff --git a/manifest.uuid b/manifest.uuid
index fbe47e760bdde3643313ff05f6323f25459eedae..598ed34cc439513e1703a94835e9b16d1ae2c92a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7d0817c176832a88788cc973c0aae8dcab57364
\ No newline at end of file
+ed1d4f47ee9a2bcafdee92ee6bfcb2b0d1758f76
\ No newline at end of file

diff --git a/test/savepoint4.test b/test/savepoint4.test
index 30a1097fbdd7bb93a41b1b09c061a7df5938a135..f8c5b713c2fef432a24fd5bfc718a2845913db10 100644 (file)
--- a/test/savepoint4.test
+++ b/test/savepoint4.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: savepoint4.test,v 1.6 2009/06/05 17:09:12 drh Exp $
+# $Id: savepoint4.test,v 1.7 2009/06/09 15:25:33 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -127,14 +127,16 @@ for {set ii 1} {$ii<=$ITERATIONS2} {incr ii} {
           RELEASE two;
 
           SAVEPOINT three;
-            UPDATE t1 SET x = x||x WHERE (rowid%12)==0;
+            UPDATE t1 SET x = substr(x||x, 12, 100000) WHERE (rowid%12)==0;
             SAVEPOINT four;
-              UPDATE t1 SET x = x||x WHERE (rowid%14)==0;
+              UPDATE t1 SET x = substr(x||x, 14, 100000) WHERE (rowid%14)==0;
            ROLLBACK TO three;
-            UPDATE t1 SET x = x||x WHERE (rowid%13)==0;
+            UPDATE t1 SET x = substr(x||x, 13, 100000) WHERE (rowid%13)==0;
           RELEASE three;
 
-        DELETE FROM t1 WHERE rowid > (SELECT rowid FROM t1 LIMIT 1 OFFSET 256);
+        DELETE FROM t1 WHERE rowid > (
+          SELECT rowid FROM t1 ORDER BY rowid ASC LIMIT 1 OFFSET 256
+        );
         RELEASE one;
       }]