summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-02-24 13:20:51 -0800
committerunknown <brian@zim.(none)>2006-02-24 13:20:51 -0800
commit868cc7fd4405332858dae6e975fbab21be75be5b (patch)
tree9f5fa93232e8bbaf2680ef79d6dc936c4b0fe220 /mysql-test/r
parent263abaebbe77354ff65a0860d9f1828f64b03386 (diff)
downloadmariadb-git-868cc7fd4405332858dae6e975fbab21be75be5b.tar.gz
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Delete: include/raid.h BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Delete: mysys/raid.cc BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Delete: mysys/raid2.c include/Makefile.am: Removing raid include/my_sys.h: Removing Raid include/myisam.h: Removing raid mysql-test/r/case.result: Cleaned up incomming tables mysql-test/r/mysqlcheck.result: new results mysql-test/t/case.test: Cleaned up test mysql-test/t/mysqlcheck.test: Cleaned up two tests. mysys/Makefile.am: Removed raid mysys/my_static.c: Removed raid storage/myisam/mi_check.c: Removed raid storage/myisam/mi_info.c: Removed raid bits.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/case.result2
-rw-r--r--mysql-test/r/mysqlcheck.result2
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index ea80695ad7b..83b7995002d 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -1,4 +1,4 @@
-drop table if exists t1;
+drop table if exists t1,t2;
select CASE "b" when "a" then 1 when "b" then 2 END;
CASE "b" when "a" then 1 when "b" then 2 END
2
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index bd4bbc15a4f..75ae39f14fb 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -1,3 +1,5 @@
+DROP SCHEMA test;
+CREATE SCHEMA test;
cluster_replication.binlog_index OK
mysql.columns_priv OK
mysql.db OK