diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 20:32:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 20:32:04 +0300 |
| commit | 0b4ed0b7fbc8d61441718e05d95897c1bae430c4 (patch) | |
| tree | b554868ace6265c4a9186f8822246daca345d498 /mysql-test/suite/binlog_encryption | |
| parent | d98ccbe1e1a8190d295fe91942ba739a12d9e245 (diff) | |
| parent | aa6cb7ed03bb41b7ba59b6d7c9197cf24d65a36d (diff) | |
| download | mariadb-git-0b4ed0b7fbc8d61441718e05d95897c1bae430c4.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
| -rw-r--r-- | mysql-test/suite/binlog_encryption/restart_server.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog_encryption/restart_server.inc b/mysql-test/suite/binlog_encryption/restart_server.inc index 6cd0788cf43..8f0fe7d8970 100644 --- a/mysql-test/suite/binlog_encryption/restart_server.inc +++ b/mysql-test/suite/binlog_encryption/restart_server.inc @@ -22,7 +22,7 @@ --enable_reconnect --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect -shutdown_server 10; +shutdown_server; --source include/wait_until_disconnected.inc |