diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-24 13:36:51 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-24 20:35:27 +0400 |
| commit | 2b7573ecdda4e542fc65e5d0992f5c05474975c0 (patch) | |
| tree | 451592b3d38ed98916f2b5bc9ae8052ee2a2020b /mysql-test/t/partition_innodb_plugin.test | |
| parent | 19e3597e0c718a4cfdfe8789c7b4b11a4e0ba0c6 (diff) | |
| download | mariadb-git-2b7573ecdda4e542fc65e5d0992f5c05474975c0.tar.gz | |
MDEV-9975 - main.partition_innodb_plugin fails sporadically
Fixed wait condition to wait for InnoDB to actually acquire row locks instead
of waiting for thread to enter "Searching rows for update" state (which happens
earlier).
Also use default wait timeout, 2 seconds can be too few for threads to enter
appropriate state.
Diffstat (limited to 'mysql-test/t/partition_innodb_plugin.test')
| -rw-r--r-- | mysql-test/t/partition_innodb_plugin.test | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test index 4693288a4dd..a951945a87c 100644 --- a/mysql-test/t/partition_innodb_plugin.test +++ b/mysql-test/t/partition_innodb_plugin.test @@ -124,12 +124,8 @@ SEND; UPDATE `t``\""e` SET a = 12 WHERE a = 0; --echo # default connection connection default; -let $wait_timeout= 2; -let $wait_condition= SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST -WHERE ID = $id_1 AND STATE = 'Searching rows for update'; +let $wait_condition= SELECT COUNT(*)=2 FROM INFORMATION_SCHEMA.INNODB_LOCKS; --source include/wait_condition.inc -#--echo # tested wait condition $wait_condition_reps times -# INNODB_LOCKS only exists in innodb_plugin --sorted_result SELECT lock_table, COUNT(*) FROM INFORMATION_SCHEMA.INNODB_LOCKS GROUP BY lock_table; |