Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1

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;

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;

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)