diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:18:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 19:18:34 +0300 |
| commit | c277bcd591821b9956bf0d0c0a71ceb3e230f060 (patch) | |
| tree | 46467107f92c2b665e9ebadcda68c4fa0f494c75 /storage/tokudb | |
| parent | 9be0b6140719b7169fa30f54c86519e86b290205 (diff) | |
| parent | f3160ee44f8f3ae4e5eeea768e289ec40253f35e (diff) | |
| download | mariadb-git-c277bcd591821b9956bf0d0c0a71ceb3e230f060.tar.gz | |
Merge 10.2 into 10.3
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 ceb119cd0dc..fab7f6e1cbc 100644 --- a/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test +++ b/storage/tokudb/mysql-test/tokudb_rpl/t/mdev12179.test @@ -155,7 +155,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. |