diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-20 10:24:32 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-20 10:24:32 +0200 |
| commit | 02863b41804352f1371407ccdc9e1cb51b9e20e3 (patch) | |
| tree | 454ab81e4898c9102f39f0802a13bbb0a5236f09 /mysql-test/extra | |
| parent | ac6026ce2774222b4607fcad4e36bbd5c25ff60a (diff) | |
| parent | 72b228c581e81dc07a6ac61a57b89ce80d0e5847 (diff) | |
| download | mariadb-git-02863b41804352f1371407ccdc9e1cb51b9e20e3.tar.gz | |
Merge from mysql-5.5-runtime to mysql-5.5-bugfixing.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_innodb.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_innodb.test b/mysql-test/extra/rpl_tests/rpl_innodb.test index 4bc1c004ba7..8b9b7e7ff39 100644 --- a/mysql-test/extra/rpl_tests/rpl_innodb.test +++ b/mysql-test/extra/rpl_tests/rpl_innodb.test @@ -153,7 +153,7 @@ connection master; let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE info = "RENAME TABLE t1 TO t3, t2 TO t1" and - state = "Waiting for table"; + state = "Waiting for table metadata lock"; --source include/wait_condition.inc COMMIT; |