diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
commit | ee8b5c305a2334d06fe999b2db441d0436f9f423 (patch) | |
tree | fb613fed64234c3e211d2ae01272e1f31ca19138 /mysql-test/include | |
parent | 11544334a277508fb984c0a5bba8faa6b97a2762 (diff) | |
parent | 4f5338467807f099b67f07d0bfb415358222a2b1 (diff) | |
download | mariadb-git-ee8b5c305a2334d06fe999b2db441d0436f9f423.tar.gz |
Merge tag 'mariadb-10.0.29' into 10.0-galera
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/sync_slave_sql_with_io.inc | 4 | ||||
-rw-r--r-- | mysql-test/include/sync_with_master_gtid.inc | 4 | ||||
-rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/include/sync_slave_sql_with_io.inc b/mysql-test/include/sync_slave_sql_with_io.inc index 8048f7a177c..9efede9a61f 100644 --- a/mysql-test/include/sync_slave_sql_with_io.inc +++ b/mysql-test/include/sync_slave_sql_with_io.inc @@ -26,6 +26,10 @@ let $_slave_timeout= $slave_timeout; if (!$_slave_timeout) { let $_slave_timeout= 300; + if ($VALGRIND_TEST) + { + let $_slave_timeout= 1500; + } } --let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) diff --git a/mysql-test/include/sync_with_master_gtid.inc b/mysql-test/include/sync_with_master_gtid.inc index 97ada8eea29..777711b979c 100644 --- a/mysql-test/include/sync_with_master_gtid.inc +++ b/mysql-test/include/sync_with_master_gtid.inc @@ -34,6 +34,10 @@ let $_slave_timeout= $slave_timeout; if (!$_slave_timeout) { let $_slave_timeout= 120; + if ($VALGRIND_TEST) + { + let $_slave_timeout= 1200; + } } --let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)` diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index d3f7ec56614..25020d46ed9 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -50,6 +50,10 @@ let $_slave_timeout= $slave_timeout; if (!$_slave_timeout) { let $_slave_timeout= 300; + if ($VALGRIND_TEST) + { + let $_slave_timeout= 1500; + } } if ($slave_error_param == '') |