diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
| commit | 79479ee97571e8023b0269ffddbf525d54955273 (patch) | |
| tree | 6297405507fee3aa01617a4f8462cc413d880452 /mysql-test/include | |
| parent | 8404b44a845e8a827bf1986fe4450673782bfdae (diff) | |
| download | mariadb-git-79479ee97571e8023b0269ffddbf525d54955273.tar.gz | |
After-merge fixes for 5.5 merge.
Fix typo causing too low timeout value for wait_for_slave_param.inc.
Fix binlog checksums following 5.5 merge.
Make sure the rpl suite can run with --mysqld=--binlog-checksum=CRC32
Fix a number of problems in the code when checksums are enabled.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 2 |
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 131d91a8440..d6cff32b398 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -79,7 +79,7 @@ if ($_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) { |