diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-07-02 11:26:27 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-07-02 11:26:27 +0200 |
| commit | 3ffa8b3b90b551ea558ebf9323f1b34376605188 (patch) | |
| tree | 36322c649c613ad33c69a4bb83bdd31b83d077ed /mysql-test/t/mdl_sync.test | |
| parent | 6afc935c40220440ef59607bccca3172fbadcd32 (diff) | |
| download | mariadb-git-3ffa8b3b90b551ea558ebf9323f1b34376605188.tar.gz | |
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.
Diffstat (limited to 'mysql-test/t/mdl_sync.test')
| -rw-r--r-- | mysql-test/t/mdl_sync.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/t/mdl_sync.test index 441cabb10e2..6b721ace07f 100644 --- a/mysql-test/t/mdl_sync.test +++ b/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; |