fixed "DROP table_open_in_handler" hang

2 files changed, 24 insertions, 5 deletions

diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result
index 35765c48049..9760719ecf2 100644
--- a/mysql-test/r/handler.result
+++ b/mysql-test/r/handler.result
@@ -136,4 +136,10 @@ a	b
 handler t2 read last;
 You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 handler t2 close;
-drop table if exists t1;
+handler t1 open as t2;
+drop table t1;
+create table t1 (a int);
+insert into t1 values (17);
+handler t2 read first;
+Unknown table 't2' in HANDLER
+drop table t1;
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index 4f1b11c80ff..f5bab7cf337 100644
--- a/mysql-test/t/handler.test
+++ b/mysql-test/t/handler.test
@@ -28,13 +28,15 @@ handler t2 read a next;
 handler t2 read a=(15);
 handler t2 read a=(16);
 
-!$1070 handler t2 read a=(19,"fff");
+--error 1070
+handler t2 read a=(19,"fff");
 
 handler t2 read b=(19,"fff");
 handler t2 read b=(19,"yyy");
 handler t2 read b=(19);
 
-!$1109 handler t1 read a last;
+--error 1109
+handler t1 read a last;
 
 handler t2 read a=(11);
 handler t2 read a>=(11);
@@ -60,8 +62,19 @@ handler t2 read first;
 handler t2 read next;
 alter table t1 type=MyISAM;
 handler t2 read next;
-!$1064 handler t2 read last;
+--error 1064
+handler t2 read last;
 
 handler t2 close;
-drop table if exists t1;
+
+#
+# DROP TABLE
+#
+handler t1 open as t2;
+drop table t1;
+create table t1 (a int);
+insert into t1 values (17);
+--error 1109
+handler t2 read first;
+drop table t1;