summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2004-03-31 14:29:01 +0500
committerunknown <gluh@gluh.mysql.r18.ru>2004-03-31 14:29:01 +0500
commit48014f22889d2801328af20cf1e6b3e2a1fc2c31 (patch)
tree7a393f4d7fcf846898c0797b65bb14bf8576d111
parent00967819f3963e46dfdbf87b49d6f918955fab5c (diff)
downloadmariadb-git-48014f22889d2801328af20cf1e6b3e2a1fc2c31.tar.gz
Fix for bug #2160: Extra error message for CREATE TABLE LIKE with InnoDB
-rw-r--r--mysql-test/r/innodb.result3
-rw-r--r--mysql-test/t/innodb.test7
-rw-r--r--sql/ha_innodb.h1
3 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 4cec61faf0d..5e513061821 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1440,3 +1440,6 @@ third
2
3
drop table t1;
+create table t1 (a int) engine=innodb;
+create table t2 like t1;
+drop table t1,t2;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 5602a57905b..e20be83b4b6 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -1037,3 +1037,10 @@ create table t1 (id int, name char(10) not null, name2 char(10) not null) engi
insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt');
select name2 from t1 union all select name from t1 union all select id from t1;
drop table t1;
+
+#
+# Bug2160
+#
+create table t1 (a int) engine=innodb;
+create table t2 like t1;
+drop table t1,t2;
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 4efde3e95d2..a9e8c146d69 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -95,7 +95,6 @@ class ha_innobase: public handler
HA_NOT_EXACT_COUNT |
HA_NO_WRITE_DELAYED |
HA_PRIMARY_KEY_IN_READ_INDEX |
- HA_DROP_BEFORE_CREATE |
HA_TABLE_SCAN_ON_INDEX),
last_dup_key((uint) -1),
start_of_scan(0)