diff --git a/mysql-test/r/innodb_handler.result b/mysql-test/r/innodb_handler.result index a55114a0e3dd0ec06a45d55a548afa4d30497763..79ebd96ceaf224d9cdb7152ea488e759b2943b59 100644 --- a/mysql-test/r/innodb_handler.result +++ b/mysql-test/r/innodb_handler.result @@ -129,11 +129,12 @@ a b handler t2 read next; a b 18 eee -alter table t1 type=innodb; -handler t2 read next; +handler t2 close; +handler t1 open as t2; +handler t2 read first; a b -19 fff +17 ddd +alter table t1 type=innodb; 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; diff --git a/mysql-test/t/innodb_handler.test b/mysql-test/t/innodb_handler.test index 6b85be9c7ab3e5e7136092bfce56d6b043575933..0af822334fa68efb6762138c065697ddc5a4bc25 100644 --- a/mysql-test/t/innodb_handler.test +++ b/mysql-test/t/innodb_handler.test @@ -62,15 +62,13 @@ handler t2 read a=(19) where b="yyy"; handler t2 read first; handler t2 read next; -# -# We alter the table even if it's still in use by to test the Innodb -# delayed-drop code. This will generate a warning in the master.err log. -# +handler t2 close; + +handler t1 open as t2; +handler t2 read first; alter table t1 type=innodb; -handler t2 read next; ---error 1064 +--error 1109 handler t2 read last; -handler t2 close; drop table if exists t1;