diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-08-26 15:23:44 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-08-26 15:23:44 +0400 |
| commit | d1fb4ba2995b3a0364d1a7bca21a20a203b5bfa1 (patch) | |
| tree | a59c1cfce5c34e5e04be83a9431aa59f19154afd /mysql-test | |
| parent | b4dc600af919f8a7fa8403535847256161abc1db (diff) | |
| download | mariadb-git-d1fb4ba2995b3a0364d1a7bca21a20a203b5bfa1.tar.gz | |
Fixed race condition in a test case for BUG#55580.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_mysql.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test index 4f13e15a627..ae03bebfbe3 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql.test +++ b/mysql-test/suite/innodb/t/innodb_mysql.test @@ -768,9 +768,14 @@ START TRANSACTION; SELECT * FROM t1 LOCK IN SHARE MODE; connection con1; +let $conn_id= `SELECT CONNECTION_ID()`; --send SELECT * FROM t1 FOR UPDATE connection con2; +let $wait_timeout= 2; +let $wait_condition= SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE ID=$conn_id AND STATE='Sending data'; +--source include/wait_condition.inc --echo # should not crash --error ER_LOCK_DEADLOCK SELECT * FROM t1 GROUP BY (SELECT a FROM t2 LIMIT 1 FOR UPDATE) + t1.a; |