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 /storage/tokudb | |
| parent | 688fb6301c190a16987c91f5e14bdcc85d9b0ffa (diff) | |
| parent | c277bcd591821b9956bf0d0c0a71ceb3e230f060 (diff) | |
| download | mariadb-git-aa6cb7ed03bb41b7ba59b6d7c9197cf24d65a36d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test b/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test index 1d19a25889e..a87da95a220 100644 --- a/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test +++ b/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test @@ -237,7 +237,7 @@ SHOW STATUS LIKE "%transactions%engine"; --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect wait EOF ---shutdown_server 30 +--shutdown_server --source include/wait_until_disconnected.inc # Restart without binary log. |