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/t/insert_notembedded.test | |
| 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/t/insert_notembedded.test')
| -rw-r--r-- | mysql-test/t/insert_notembedded.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/insert_notembedded.test b/mysql-test/t/insert_notembedded.test index 510dc56e8f7..4e5fe6f6755 100644 --- a/mysql-test/t/insert_notembedded.test +++ b/mysql-test/t/insert_notembedded.test @@ -174,7 +174,7 @@ connection default; # we must wait till the insert opens and locks the table let $wait_condition= select count(*) = 1 from information_schema.processlist - where state = "Table lock" and id = $ID; + where state = "Waiting for table level lock" and id = $ID; --source include/wait_condition.inc connect (select,localhost,root,,); --echo connection: select |