summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvva@eagle.mysql.r18.ru <>2003-08-28 10:26:56 -0400
committervva@eagle.mysql.r18.ru <>2003-08-28 10:26:56 -0400
commit79be48410db1b0d0da203b1978818f270e3a82c8 (patch)
tree9d52baa0469a96afd1f6aeed5d82beaee138fb3f
parent60fc3ae02be7fda08e74ef6d2bad41dc759aadb7 (diff)
downloadmariadb-git-79be48410db1b0d0da203b1978818f270e3a82c8.tar.gz
fixed merge mistake
-rw-r--r--mysql-test/r/create.result1
-rw-r--r--mysql-test/t/create.test2
2 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index be35bda3b6c..80ff8aef15b 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -310,7 +310,6 @@ t1 CREATE TABLE `t1` (
) TYPE=MyISAM CHARSET=latin1
SET SESSION table_type=default;
drop table t1;
-drop table t1;
create table t1 select x'4132';
drop table t1;
create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index fee3e796805..2e21768dc0b 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -216,8 +216,6 @@ show create table t1;
SET SESSION table_type=default;
drop table t1;
-drop table t1;
-
#
# Bug # 801
#