1 files changed, 47 insertions, 1 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index b798b49dd34..f1712a650b1 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -50,6 +50,7 @@ information_schema
 mtr
 mysql
 mysqltest
+performance_schema
 test
 flush tables with read lock;
 drop database mysqltest;
@@ -61,6 +62,7 @@ Database
 information_schema
 mtr
 mysql
+performance_schema
 test
 drop database mysqltest;
 ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
@@ -77,8 +79,8 @@ drop table t1;
 drop database if exists mysqltest;
 drop table if exists t1;
 create table t1 (i int);
-lock tables t1 read;
 create database mysqltest;
+lock tables t1 read;
 drop table t1;
 show open tables;
 drop database mysqltest;
@@ -86,6 +88,26 @@ select 1;
 1
 1
 unlock tables;
+drop table if exists t1,t2;
+create table t1 (a int);
+create table t2 (a int);
+lock table t1 read;
+drop table t2;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+drop table t1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+unlock tables;
+drop table t1,t2;
+create table t1 (i int);
+create table t2 (i int);
+lock tables t1 read;
+lock tables t2 read;
+drop table t1;
+ERROR HY000: Table 't1' was not locked with LOCK TABLES
+drop table t1,t2;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+unlock tables;
+drop table t1,t2;
 End of 5.0 tests
 create database mysql_test;
 create table mysql_test.t1(f1 int);
@@ -121,3 +143,27 @@ ERROR 42000: Incorrect table name '#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 use test;
 drop database mysqltestbug26703;
 End of 5.1 tests
+
+# --
+# -- Bug#37431 (DROP TABLE does not report errors correctly).
+# --
+DROP TABLE IF EXISTS t1;
+DROP TABLE t1;
+ERROR 42S02: Unknown table 't1'
+SHOW WARNINGS;
+Level	Code	Message
+Error	1051	Unknown table 't1'
+
+# --
+# -- End of Bug#37431.
+# --
+#
+# Bug#54282 Crash in MDL_context::upgrade_shared_lock_to_exclusive
+#
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a INT);
+LOCK TABLE t1 WRITE;
+DROP TABLE t1, t1;
+ERROR 42000: Not unique table/alias: 't1'
+UNLOCK TABLES;
+DROP TABLE t1;