diff options
Diffstat (limited to 'mysql-test')
29 files changed, 29 insertions, 2 deletions
diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result index 9f1c8ffac41..94b06ee4d28 100644 --- a/mysql-test/r/binary.result +++ b/mysql-test/r/binary.result @@ -1,3 +1,4 @@ +drop table if exists t1,t2; create table t1 (name char(20) not null, primary key (name)); create table t2 (name char(20) binary not null, primary key (name)); insert into t1 values ("å"); diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 44aef139ad2..9e375203e49 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (a char(10), tmsp timestamp); insert into t1 set a = 1; insert delayed into t1 set a = 2; diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/r/fulltext_left_join.result index 9f2ba6a5947..abc63358dbe 100644 --- a/mysql-test/r/fulltext_left_join.result +++ b/mysql-test/r/fulltext_left_join.result @@ -1,3 +1,4 @@ +drop table if exists t1, t2; CREATE TABLE t1 ( id VARCHAR(255) NOT NULL PRIMARY KEY, sujet VARCHAR(255), diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index 2d24b8ffd4e..c1f36283ab0 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1,3 +1,4 @@ +drop table if exists t1,t2; create table t1 (grp int, a bigint unsigned, c char(10) not null); insert into t1 values (1,1,"a"); insert into t1 values (2,2,"b"); diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result index 8c991dee8d8..ba33ee0831d 100644 --- a/mysql-test/r/func_in.result +++ b/mysql-test/r/func_in.result @@ -1,3 +1,4 @@ +drop table if exists t1; CREATE TABLE t1 (field char(1)); INSERT INTO t1 VALUES ('A'),(NULL); SELECT * from t1 WHERE field IN (NULL); diff --git a/mysql-test/r/key_primary.result b/mysql-test/r/key_primary.result index 10771a134fc..87289f1cf54 100644 --- a/mysql-test/r/key_primary.result +++ b/mysql-test/r/key_primary.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (t1 char(3) primary key); insert into t1 values("ABC"); insert into t1 values("ABA"); diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 6fe8cc71185..20bc9b9572f 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1(n int); insert into t1 values (1); lock tables t1 write; diff --git a/mysql-test/r/odbc.result b/mysql-test/r/odbc.result index c696cf94e9d..5aa163a663e 100644 --- a/mysql-test/r/odbc.result +++ b/mysql-test/r/odbc.result @@ -1,6 +1,7 @@ select {fn length("hello")}, { date "1997-10-20" }; {fn length("hello")} 1997-10-20 5 1997-10-20 +drop table if exists t1; create table t1 (a int not null auto_increment,b int not null,primary key (a,b)); insert into t1 SET A=NULL,B=1; insert into t1 SET a=null,b=2; diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result index 858bf5f3ba2..59f8744e2ec 100644 --- a/mysql-test/r/type_set.result +++ b/mysql-test/r/type_set.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (a set (' ','a','b') not null); show create table t1; Table Create Table diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index ff700f456ef..bacc3ec0176 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (t time); insert into t1 values("10:22:33"),("12:34:56.78"),(10),(1234),(123456.78),(1234559.99),("1"),("1:23"),("1:23:45"), ("10.22"), ("-10 1:22:33.45"),("20 10:22:33"),("1999-02-03 20:33:34"); insert t1 values (30),(1230),("1230"),("12:30"),("12:30:35"),("1 12:30:31.32"); diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result index ab53d27e8f3..bd5e9f04992 100644 --- a/mysql-test/r/type_timestamp.result +++ b/mysql-test/r/type_timestamp.result @@ -1,3 +1,4 @@ +drop table if exists t1; CREATE TABLE t1 ( t timestamp); SET TIMESTAMP=1234; insert into t1 values(NULL); diff --git a/mysql-test/r/type_year.result b/mysql-test/r/type_year.result index c892d575ca0..25ddda88f48 100644 --- a/mysql-test/r/type_year.result +++ b/mysql-test/r/type_year.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (y year,y2 year(2)); insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69); select * from t1; diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result index a63db14b736..75ff9c3976b 100644 --- a/mysql-test/r/varbinary.result +++ b/mysql-test/r/varbinary.result @@ -7,6 +7,7 @@ select 0x31+1,concat(0x31)+1,-0xf; select x'31',X'ffff'+0; x'31' X'ffff'+0 1 65535 +drop table if exists t1; create table t1 (ID int(8) unsigned zerofill not null auto_increment,UNIQ bigint(21) unsigned zerofill not null,primary key (ID),unique (UNIQ) ); insert into t1 set UNIQ=0x38afba1d73e6a18a; insert into t1 set UNIQ=123; diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index d77e98cc635..e5713718db0 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (a int); insert into t1 values (1); insert into t1 values ("hej"); diff --git a/mysql-test/t/binary.test b/mysql-test/t/binary.test index 7853b013ae6..be9917dc888 100644 --- a/mysql-test/t/binary.test +++ b/mysql-test/t/binary.test @@ -2,6 +2,7 @@ # test sort,min and max on binary fields # +drop table if exists t1,t2; create table t1 (name char(20) not null, primary key (name)); create table t2 (name char(20) binary not null, primary key (name)); insert into t1 values ("å"); diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index 6fbd99e3283..67111ea1734 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -3,6 +3,7 @@ # (Can't be tested with purify :( ) # +drop table if exists t1; create table t1 (a char(10), tmsp timestamp); insert into t1 set a = 1; insert delayed into t1 set a = 2; diff --git a/mysql-test/t/flush_table.test b/mysql-test/t/flush_table.test index a4f12886120..4ddcd53d5c8 100644 --- a/mysql-test/t/flush_table.test +++ b/mysql-test/t/flush_table.test @@ -4,6 +4,7 @@ # Test of flush table # +#drop table if exists t1; #create table t1 (a int not null auto_increment primary key); #insert into t1 values(0); #lock table t1 read; diff --git a/mysql-test/t/fulltext_left_join.test b/mysql-test/t/fulltext_left_join.test index abb1c8e8473..bcf7cbcc505 100644 --- a/mysql-test/t/fulltext_left_join.test +++ b/mysql-test/t/fulltext_left_join.test @@ -2,6 +2,7 @@ # Test for bug from Jean-Cédric COSTA <jean-cedric.costa@ensmp.fr> # +drop table if exists t1, t2; CREATE TABLE t1 ( id VARCHAR(255) NOT NULL PRIMARY KEY, sujet VARCHAR(255), diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index b97afc06340..57e9ae24e08 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -2,6 +2,7 @@ # simple test of all group functions # +drop table if exists t1,t2; create table t1 (grp int, a bigint unsigned, c char(10) not null); insert into t1 values (1,1,"a"); insert into t1 values (2,2,"b"); diff --git a/mysql-test/t/func_in.test b/mysql-test/t/func_in.test index 6830534e761..e5d42ec25c4 100644 --- a/mysql-test/t/func_in.test +++ b/mysql-test/t/func_in.test @@ -2,6 +2,7 @@ # test of IN (NULL) # +drop table if exists t1; CREATE TABLE t1 (field char(1)); INSERT INTO t1 VALUES ('A'),(NULL); SELECT * from t1 WHERE field IN (NULL); diff --git a/mysql-test/t/key_primary.test b/mysql-test/t/key_primary.test index 75dded5d667..2cdb117128f 100644 --- a/mysql-test/t/key_primary.test +++ b/mysql-test/t/key_primary.test @@ -2,6 +2,7 @@ # test of primary key conversions # +drop table if exists t1; create table t1 (t1 char(3) primary key); insert into t1 values("ABC"); insert into t1 values("ABA"); diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index 53e9fd3393c..792ae956e2a 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -6,6 +6,7 @@ # -- source include/not_embedded.inc +drop table if exists t1; #test to see if select will get the lock ahead of low priority update connect (locker,localhost,root,,); diff --git a/mysql-test/t/odbc.test b/mysql-test/t/odbc.test index 4629a08fd3f..3e0fc214d3e 100644 --- a/mysql-test/t/odbc.test +++ b/mysql-test/t/odbc.test @@ -8,6 +8,7 @@ select {fn length("hello")}, { date "1997-10-20" }; # Test retreiving row with last insert_id value. # +drop table if exists t1; create table t1 (a int not null auto_increment,b int not null,primary key (a,b)); insert into t1 SET A=NULL,B=1; insert into t1 SET a=null,b=2; diff --git a/mysql-test/t/type_set.test b/mysql-test/t/type_set.test index 39bcbcbf75d..7f1a75e5dbd 100644 --- a/mysql-test/t/type_set.test +++ b/mysql-test/t/type_set.test @@ -2,6 +2,7 @@ # Test of SET with space # +drop table if exists t1; create table t1 (a set (' ','a','b') not null); show create table t1; drop table t1; diff --git a/mysql-test/t/type_time.test b/mysql-test/t/type_time.test index fde93576510..2496ec36915 100644 --- a/mysql-test/t/type_time.test +++ b/mysql-test/t/type_time.test @@ -1,6 +1,7 @@ # # testing of the TIME column type # +drop table if exists t1; create table t1 (t time); insert into t1 values("10:22:33"),("12:34:56.78"),(10),(1234),(123456.78),(1234559.99),("1"),("1:23"),("1:23:45"), ("10.22"), ("-10 1:22:33.45"),("20 10:22:33"),("1999-02-03 20:33:34"); insert t1 values (30),(1230),("1230"),("12:30"),("12:30:35"),("1 12:30:31.32"); diff --git a/mysql-test/t/type_timestamp.test b/mysql-test/t/type_timestamp.test index a6169c03d3d..19af6b0c49c 100644 --- a/mysql-test/t/type_timestamp.test +++ b/mysql-test/t/type_timestamp.test @@ -2,6 +2,7 @@ # Test timestamp # +drop table if exists t1; CREATE TABLE t1 ( t timestamp); SET TIMESTAMP=1234; insert into t1 values(NULL); diff --git a/mysql-test/t/type_year.test b/mysql-test/t/type_year.test index 70a3053f19b..8f4f23badb4 100644 --- a/mysql-test/t/type_year.test +++ b/mysql-test/t/type_year.test @@ -1,7 +1,7 @@ # # Test year # - +drop table if exists t1; create table t1 (y year,y2 year(2)); insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69); select * from t1; diff --git a/mysql-test/t/varbinary.test b/mysql-test/t/varbinary.test index 6d2660271ea..cc9ee99b7f9 100644 --- a/mysql-test/t/varbinary.test +++ b/mysql-test/t/varbinary.test @@ -10,6 +10,7 @@ select x'31',X'ffff'+0; # Test of hex constants in WHERE: # +drop table if exists t1; create table t1 (ID int(8) unsigned zerofill not null auto_increment,UNIQ bigint(21) unsigned zerofill not null,primary key (ID),unique (UNIQ) ); insert into t1 set UNIQ=0x38afba1d73e6a18a; insert into t1 set UNIQ=123; diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index e7cb1f46ec3..5fb536def71 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -1,7 +1,7 @@ # # Test some warnings # - +drop table if exists t1; create table t1 (a int); insert into t1 values (1); insert into t1 values ("hej"); |