mysql-5.5.31 merge

2 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result
index 96d21e7373a..fb633bb94c4 100644
--- a/mysql-test/suite/handler/interface.result
+++ b/mysql-test/suite/handler/interface.result
@@ -294,3 +294,13 @@ ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
 USE test;
 PREPARE h_r FROM 'HANDLER t1 READ `PRIMARY` LAST';
 ERROR 42S02: Unknown table 't1' in HANDLER
+create view v as select 1;
+create temporary table v as select 2;
+handler v open;
+prepare stmt from 'create table if not exists v as select 3';
+execute stmt;
+Warnings:
+Note	1050	Table 'v' already exists
+handler v read next;
+ERROR 42S02: Unknown table 'v' in HANDLER
+drop view v;
diff --git a/mysql-test/suite/handler/interface.test b/mysql-test/suite/handler/interface.test
index e4e854b2515..2ef617c3ce7 100644
--- a/mysql-test/suite/handler/interface.test
+++ b/mysql-test/suite/handler/interface.test
@@ -377,3 +377,16 @@ USE test;
 #
 --error ER_UNKNOWN_TABLE
 PREPARE h_r FROM 'HANDLER t1 READ `PRIMARY` LAST';
+
+#
+# MySQL Bug#16385711: HANDLER, CREATE TABLE IF NOT EXISTS, PROBLEM AFTER MYSQL_HA_FIND
+#
+create view v as select 1;
+create temporary table v as select 2;
+handler v open;
+prepare stmt from 'create table if not exists v as select 3';
+execute stmt;
+--error ER_UNKNOWN_TABLE
+handler v read next;
+drop view v;
+