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/storage_engine | |
| parent | 688fb6301c190a16987c91f5e14bdcc85d9b0ffa (diff) | |
| parent | c277bcd591821b9956bf0d0c0a71ceb3e230f060 (diff) | |
| download | mariadb-git-aa6cb7ed03bb41b7ba59b6d7c9197cf24d65a36d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/storage_engine')
| -rw-r--r-- | mysql-test/suite/storage_engine/alter_tablespace.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/storage_engine/trx/xa_recovery.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 3c4910069a0..1899da28320 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -46,7 +46,7 @@ wait EOF --enable_reconnect - --shutdown_server 60 + --shutdown_server --source include/wait_until_disconnected.inc diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.test b/mysql-test/suite/storage_engine/trx/xa_recovery.test index e17bb9d2ea4..f53640578cd 100644 --- a/mysql-test/suite/storage_engine/trx/xa_recovery.test +++ b/mysql-test/suite/storage_engine/trx/xa_recovery.test @@ -12,7 +12,7 @@ --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart EOF ---shutdown_server 60 +--shutdown_server --source include/wait_until_connected_again.inc |