Fix the misc3.test test file. (CVS 1415)

FossilOrigin-Name: 478836f44825d8154c0106e46e9a2b2daaa4cf33

diff --git a/manifest b/manifest
index 147a1423118c05ee7581e3f3314e8f15d3484def..d2fff1a8b6e92292b4e76c1a4e2fd858db89f90e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfix\sassociated\swith\smisc3.test.\s(CVS\s1414)
-D 2004-05-20T03:02:47
+C Fix\sthe\smisc3.test\stest\sfile.\s(CVS\s1415)
+D 2004-05-20T03:30:11
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -111,7 +111,7 @@ F test/memleak.test 4d5d374c8ea1fc5ac634aed58cac1047848ce65e
 F test/minmax.test 9dcf52f713b1b9e61d0a88a51eb8bb2e3c52d0ab
 F test/misc1.test 2e1c0d592f082491984cccabfae213cb50fc574f
 F test/misc2.test 10c2ce26407d37411b96273e552d5095393732be
-F test/misc3.test 3b5e369514a3ba3f919fb7eafa7d027440b5079e
+F test/misc3.test eb488314990bfc0959221a1acc465013238bf168
 F test/misuse.test 1095f26d1aed406c65e1d2eba651c4bb7c38cbff
 F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0
 F test/null.test c14d0f4739f21e929b8115b72bf0c765b6bb1721
@@ -120,7 +120,7 @@ F test/pager2.test 7ff175a28484fd324df9315dfe35f6fb159910ec
 F test/pragma.test 06c4e51998dd68115ef7a60abeeff7accf198f83
 F test/printf.test 46b3d07d59d871d0831b4a657f6dfcafe0574850
 F test/progress.test 701b6115c2613128ececdfe1398a1bd0e1a4cfb3 x
-F test/quick.test cbd8ee836d1e2e9e61e526508fb61e3c4018fcf7
+F test/quick.test 4e4b45ac941c1d8b4c29fb66b119ed5362c368e8
 F test/quote.test 08f23385c685d3dc7914ec760d492cacea7f6e3d
 F test/rowid.test 863e6e75878cccf03d166fe52023f20e09508683
 F test/select1.test 3bfcccd2eadcddbb07f1f5da6550aee8484ea4fb
@@ -193,7 +193,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P bf2181f13fdad72d8c90eccc2d29034178181731
-R 46472217ba808b054b4a6f2e56ec1043
+P a7f02db73881eb2d899daa93646962960dac5375
+R c220a1c9147b9aa82b7860572b068793
 U drh
-Z b7043787724d907a7fdbaf95eb29b7cb
+Z 766a086b9d46979d214b9aad7633d80b

diff --git a/manifest.uuid b/manifest.uuid
index d69c2e6be52863c5a417d0d8e9a147b3120203c5..a32f3c54472138d1a0494a4a64e4f16f9e26bc08 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7f02db73881eb2d899daa93646962960dac5375
\ No newline at end of file
+478836f44825d8154c0106e46e9a2b2daaa4cf33
\ No newline at end of file

diff --git a/test/misc3.test b/test/misc3.test
index 544b96c7ec4c7143442417fbd3aa8e4f0da4f3ff..4198e0bccd6e3f5625c30f584a8c646fefecdf39 100644 (file)
--- a/test/misc3.test
+++ b/test/misc3.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc3.test,v 1.10 2004/03/17 23:32:08 drh Exp $
+# $Id: misc3.test,v 1.11 2004/05/20 03:30:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -222,7 +222,7 @@ do_test misc3-5.1 {
     INSERT INTO x2 VALUES(3,'three');
     INSERT INTO x2 VALUES(4,'four');
     SELECT x2.c AS c, e, b FROM x2 LEFT JOIN
-       (SELECT b, max(c) AS c FROM x1 GROUP BY b)
+       (SELECT b, max(c)+0 AS c FROM x1 GROUP BY b)
        USING(c);
   }
 } {1 one cat 2 two {} 3 three {} 4 four dog}
@@ -230,7 +230,7 @@ do_test misc4-5.2 {
   execsql {
     SELECT * FROM (
       SELECT x2.c AS c, e, b FROM x2 LEFT JOIN
-         (SELECT b, max(c) AS c FROM x1 GROUP BY b)
+         (SELECT b, max(c)+0 AS c FROM x1 GROUP BY b)
          USING(c)
     );
   }

diff --git a/test/quick.test b/test/quick.test
index ed2d45520f44023903e41129dcba29cc1a75f9ab..7107aa80860f93654570d6279245bf82562ddedb 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.16 2004/05/20 02:01:27 drh Exp $
+# $Id: quick.test,v 1.17 2004/05/20 03:30:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -31,7 +31,6 @@ set EXCLUDE {
 lappend EXCLUDE interrupt.test    ;# assert() fails in btree
 lappend EXCLUDE ioerr.test        ;# seg-faults (?)
 lappend EXCLUDE memdb.test        ;# fails - malformed database
-lappend EXCLUDE misc3.test        ;# seg-faults (due to VACUUM?)
 
 lappend EXCLUDE printf.test       ;# sqlite3_XX vs sqlite_XX problem
 lappend EXCLUDE auth.test         ;# Cannot attach empty databases.