diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:57:22 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:57:22 +0300 |
commit | aa6cb7ed03bb41b7ba59b6d7c9197cf24d65a36d (patch) | |
tree | 37c04559adbc4ff905492fb724033961e7c64f11 /mysql-test/suite/multi_source | |
parent | 688fb6301c190a16987c91f5e14bdcc85d9b0ffa (diff) | |
parent | c277bcd591821b9956bf0d0c0a71ceb3e230f060 (diff) | |
download | mariadb-git-aa6cb7ed03bb41b7ba59b6d7c9197cf24d65a36d.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/multi_source')
-rw-r--r-- | mysql-test/suite/multi_source/info_logs.test | 2 |
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'; |