summaryrefslogtreecommitdiff
path: root/mysql-test/suite/multi_source
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-21 19:18:34 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-21 19:18:34 +0300
commitc277bcd591821b9956bf0d0c0a71ceb3e230f060 (patch)
tree46467107f92c2b665e9ebadcda68c4fa0f494c75 /mysql-test/suite/multi_source
parent9be0b6140719b7169fa30f54c86519e86b290205 (diff)
parentf3160ee44f8f3ae4e5eeea768e289ec40253f35e (diff)
downloadmariadb-git-c277bcd591821b9956bf0d0c0a71ceb3e230f060.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/multi_source')
-rw-r--r--mysql-test/suite/multi_source/info_logs.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/multi_source/info_logs.test b/mysql-test/suite/multi_source/info_logs.test
index ef504e06a2f..234e317e5ce 100644
--- a/mysql-test/suite/multi_source/info_logs.test
+++ b/mysql-test/suite/multi_source/info_logs.test
@@ -150,7 +150,7 @@ show all slaves status;
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.3.expect
restart
EOF
---shutdown_server 60
+--shutdown_server
--source include/wait_until_connected_again.inc
--source include/wait_for_slave_to_start.inc
set default_master_connection = 'MASTER 2.2';