summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2014-04-21 18:09:18 +0400
committerElena Stepanova <elenst@montyprogram.com>2014-04-21 18:09:18 +0400
commit44ff73e9f4b6336eb701a73e41a988e4fa8a503e (patch)
treee914f4a6bb7b88706f50d641e1bce8378c38b88d
parentd7304375e5e0ce30979c2b92e70eb0effaa30a25 (diff)
downloadmariadb-git-44ff73e9f4b6336eb701a73e41a988e4fa8a503e.tar.gz
MDEV-750 LP:800035 - intermittent rpl_deadlock_innodb failures
A typo in include file caused the timeout counter to be 10x less than expected. It was fixed in 5.5.20+ along with a bigger change, now also fixing in 5.1-5.3.
-rw-r--r--mysql-test/include/wait_for_slave_param.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc
index c9660b0679d..ea319933168 100644
--- a/mysql-test/include/wait_for_slave_param.inc
+++ b/mysql-test/include/wait_for_slave_param.inc
@@ -79,7 +79,7 @@ if (`SELECT '$_slave_check_configured' = 'No such row'`)
# mysqltest doesn't provide any better way to multiply by 10
--let $_wait_for_slave_param_zero= 0
---let $_slave_timeout_counter= $_slave_timeout$zero
+--let $_slave_timeout_counter= $_slave_timeout$_wait_for_slave_param_zero
--let $_slave_continue= 1
while ($_slave_continue)
{