diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-12-11 14:43:07 -0500 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-12-11 14:43:07 -0500 |
| commit | 38f2a07d6833c3e629b0577ce7da1b463ef51d92 (patch) | |
| tree | 4e0e3ff609c18864fcf0c48168d78e9340769b87 | |
| parent | 174eed9269eaf20916af1fcda0b89797458f9a4a (diff) | |
| parent | a79eb8e85ae1bf520ff372c76030541426d33c0e (diff) | |
| download | mariadb-git-38f2a07d6833c3e629b0577ce7da1b463ef51d92.tar.gz | |
Merge branch 'master' of github.com:Tokutek/ft-engine
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test index 1becf71a80a..50e17b1af7a 100644 --- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test +++ b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test @@ -27,7 +27,8 @@ send insert into t values (1); # should find the presence of a lock on 1st transaction connection default; -real_sleep 1; # give some time for conn_b to block +let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update'; +source include/wait_condition.inc; replace_column 1 TRX_ID 2 MYSQL_ID; select * from information_schema.tokudb_locks; diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test index 87656f29395..9cc567cb296 100644 --- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test +++ b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test @@ -24,7 +24,8 @@ send insert into t values (1); # should find the presence of a lock on 1st transaction connection default; -real_sleep 1; # give some time for conn_b to get blocked +let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update'; +source include/wait_condition.inc; replace_column 1 TRX_ID 2 MYSQL_ID; select * from information_schema.tokudb_locks; diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test b/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test index 52c09c1c049..979e4786dc1 100644 --- a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test +++ b/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test @@ -30,7 +30,8 @@ send insert into t values (1); # should find the presence of a lock on 2nd transaction connection default; -real_sleep 1; # give some time for conn_b to get blocked +let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update'; +source include/wait_condition.inc; replace_column 1 TRX_ID 2 MYSQL_ID; eval select * from information_schema.tokudb_locks; |