diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result
index 853c3bcf575..809d652053e 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/r/schema.result
@@ -16,21 +16,19 @@ drop schema foo;
 # Bug #48940 MDL deadlocks against mysql_rm_db
 #
 DROP SCHEMA IF EXISTS schema1;
-DROP SCHEMA IF EXISTS schema2;
 # Connection default
 CREATE SCHEMA schema1;
-CREATE SCHEMA schema2;
 CREATE TABLE schema1.t1 (a INT);
 SET autocommit= FALSE;
 INSERT INTO schema1.t1 VALUES (1);
 # Connection 2
 DROP SCHEMA schema1;
 # Connection default
-ALTER SCHEMA schema2 DEFAULT CHARACTER SET utf8;
+ALTER SCHEMA schema1 DEFAULT CHARACTER SET utf8;
+Got one of the listed errors
 SET autocommit= TRUE;
 # Connection 2
 # Connection default
-DROP SCHEMA schema2;
 #
 # Bug #49988 MDL deadlocks with mysql_create_db, reload_acl_and_cache
 #
diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/t/mdl_sync.test
index 8f33a788c67..0c3ba8a75f2 100644
--- a/mysql-test/t/mdl_sync.test
+++ b/mysql-test/t/mdl_sync.test
@@ -4041,7 +4041,9 @@ connection default;
 --echo # Connection con2
 connection con2;
 --echo # Reaping: ALTER DATABASE db1 DEFAULT CHARACTER SET utf8
---error 1,1 # Wrong error pending followup patch for bug#54360
+# Error 1 is from ALTER DATABASE when the database does not exist.
+# Listing the error twice to prevent result diffences based on filename.
+--error 1,1
 --reap
 
 
@@ -4153,7 +4155,9 @@ connection default;
 --echo # Connection con2
 connection con2;
 --echo # Reaping: RENAME TABLE test.t2 TO db1.t2
---error 7, 7 # Wrong error pending followup patch for bug#54360
+# Error 7 is from RENAME TABLE where the target database does not exist.
+# Listing the error twice to prevent result diffences based on filename.
+--error 7, 7
 --reap
 DROP TABLE test.t2;
 
diff --git a/mysql-test/t/schema.test b/mysql-test/t/schema.test
index 7da02979943..6af7ee20b02 100644
--- a/mysql-test/t/schema.test
+++ b/mysql-test/t/schema.test
@@ -23,7 +23,6 @@ drop schema foo;
 
 --disable_warnings
 DROP SCHEMA IF EXISTS schema1;
-DROP SCHEMA IF EXISTS schema2;
 --enable_warnings
 
 connect(con2, localhost, root);
@@ -32,7 +31,6 @@ connect(con2, localhost, root);
 connection default;
 
 CREATE SCHEMA schema1;
-CREATE SCHEMA schema2;
 CREATE TABLE schema1.t1 (a INT);
 
 SET autocommit= FALSE;
@@ -48,7 +46,10 @@ let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist
                      WHERE state= 'Waiting for table metadata lock' 
                      AND info='DROP SCHEMA schema1';
 --source include/wait_condition.inc
-ALTER SCHEMA schema2 DEFAULT CHARACTER SET utf8;
+# Error 1 is from ALTER DATABASE when the database does not exist.
+# Listing the error twice to prevent result diffences based on filename.
+--error 1,1
+ALTER SCHEMA schema1 DEFAULT CHARACTER SET utf8;
 SET autocommit= TRUE;
 
 --echo # Connection 2
@@ -57,7 +58,6 @@ connection con2;
 
 --echo # Connection default
 connection default;
-DROP SCHEMA schema2;
 disconnect con2;
 
 
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index f0b53abcb03..97f8e46d052 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -188,8 +188,6 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
   if (!error)
     query_cache_invalidate3(thd, table_list, 0);
 
-  thd->mdl_context.release_transactional_locks();
-
 err:
   thd->global_read_lock.start_waiting_global_read_lock(thd);
   DBUG_RETURN(error || binlog_error);