summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
commit65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (patch)
treef145a7a095011fbc4e6661e1675f72f6cdca38b6 /mysql-test/include
parenteedd6179c1e5e8651270b353a693887179ad7bf3 (diff)
parented4ccf34a6603bd2374a721a7e1ad88472f335fc (diff)
downloadmariadb-git-65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5.tar.gz
Merge 10.2 to 10.3
Diffstat (limited to 'mysql-test/include')
-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 25020d46ed9..b06dee3c640 100644
--- a/mysql-test/include/wait_for_slave_param.inc
+++ b/mysql-test/include/wait_for_slave_param.inc
@@ -69,7 +69,7 @@ if (!$_slave_param_comparison)
if ($rpl_debug)
{
- --echo Waiting until '$slave_param' $_slave_param_comparison '$slave_param_value' [timeout='$_slave_timeout', \$slave_error_param='$slave_error_param']
+ --echo Waiting until '$slave_param' $_slave_param_comparison '$slave_param_value' [\$slave_error_param='$slave_error_param']
}
--let $_slave_check_configured= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1)