Followup to Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE

                       with open HANDLER

Fixes problem which caused mdl_sync.test to fail on Solaris and
Windows due to path name differences in error messages in the
result file.

mysql-test/r/mdl_sync.result

@@ -2649,7 +2649,7 @@ SET DEBUG_SYNC= 'now SIGNAL blocked';
 # Reaping: DROP DATABASE db1
 # Connection con2
 # Reaping: ALTER DATABASE db1 DEFAULT CHARACTER SET utf8
-ERROR HY000: Can't create/write to file './db1/db.opt' (Errcode: 2)
+Got one of the listed errors
 # Test 5:
 # Locked database name prevents CREATE of tables in that database.
 # Tests X vs IX lock.
@@ -2690,7 +2690,7 @@ SET DEBUG_SYNC= 'now SIGNAL blocked';
 # Reaping: DROP DATABASE db1
 # Connection con2
 # Reaping: RENAME TABLE db1.t1 TO test.t1
-ERROR HY000: Can't find file: './db1/t1.frm' (errno: 2)
+Got one of the listed errors
 # Connection default
 CREATE DATABASE db1;
 CREATE TABLE test.t2 (a INT);
@@ -2707,7 +2707,7 @@ SET DEBUG_SYNC= 'now SIGNAL blocked';
 # Reaping: DROP DATABASE db1
 # Connection con2
 # Reaping: RENAME TABLE test.t2 TO db1.t2
-ERROR HY000: Error on rename of './test/t2.MYI' to './db1/t2.MYI' (Errcode: 2)
+Got one of the listed errors
 DROP TABLE test.t2;
 # Test 7:
 # Locked database name prevents DROP of tables in that database.

mysql-test/t/mdl_sync.test

@@ -3947,7 +3947,7 @@ connection default;
 --echo # Connection con2
 connection con2;
 --echo # Reaping: ALTER DATABASE db1 DEFAULT CHARACTER SET utf8
---error 1 # Wrong error pending followup patch for bug#54360
+--error 1,1 # Wrong error pending followup patch for bug#54360
 --reap
 
 
@@ -4023,7 +4023,7 @@ connection default;
 --echo # Connection con2
 connection con2;
 --echo # Reaping: RENAME TABLE db1.t1 TO test.t1
---error ER_FILE_NOT_FOUND
+--error ER_FILE_NOT_FOUND, ER_FILE_NOT_FOUND
 --reap
 
 --echo # Connection default
@@ -4056,7 +4056,7 @@ connection default;
 --echo # Connection con2
 connection con2;
 --echo # Reaping: RENAME TABLE test.t2 TO db1.t2
---error 7 # Wrong error pending followup patch for bug#54360
+--error 7, 7 # Wrong error pending followup patch for bug#54360
 --reap
 DROP TABLE test.t2;