diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-22 11:15:47 +0200 |
| commit | 4ad6d6b6c9e551d84fe727d1f48edc8722098bfd (patch) | |
| tree | e305bc182a35eaf41802e4cc51a61bfd5bde5cd2 /mysql-test/t/merge-big.test | |
| parent | 38e3787af4ac87274c7ef0e632a97aa1217e284a (diff) | |
| parent | 2c7d6f12ee10903c3002bba42ee15abc2b89fa8e (diff) | |
| download | mariadb-git-4ad6d6b6c9e551d84fe727d1f48edc8722098bfd.tar.gz | |
Merge in new handler and handlersocket code into 5.3 main
Diffstat (limited to 'mysql-test/t/merge-big.test')
| -rw-r--r-- | mysql-test/t/merge-big.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index d39c2973688..10a41b609a0 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -52,7 +52,7 @@ connection default; #--sleep 8 #SELECT ID,STATE,INFO FROM INFORMATION_SCHEMA.PROCESSLIST; let $wait_condition= SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST - WHERE ID = $con1_id AND STATE = 'Locked'; + WHERE ID = $con1_id AND STATE = "Table Lock"; --source include/wait_condition.inc #SELECT NOW(); --echo # Kick INSERT out of thr_multi_lock(). |