diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-26 15:29:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-26 15:31:31 +0300 |
| commit | 926446880f937568eaae9a9671193d9d652f7bf9 (patch) | |
| tree | d62cd537c5bf5c7c81c85c6748f1c209d539c598 | |
| parent | 757daa4174ed1b8786d0307852f79885dd08ea89 (diff) | |
| download | mariadb-git-926446880f937568eaae9a9671193d9d652f7bf9.tar.gz | |
MDEV-15772: Clean up the testmariadb-5.5.64
Before killing the server, we must issue FLUSH TABLES in order
to cleanly close any MyISAM system tables, to avoid warnings about
them when restarting.
| -rw-r--r-- | mysql-test/suite/innodb/r/xa_debug.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/xa_debug.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/xa_debug.result b/mysql-test/suite/innodb/r/xa_debug.result index 43a3b299468..f1fd3f14220 100644 --- a/mysql-test/suite/innodb/r/xa_debug.result +++ b/mysql-test/suite/innodb/r/xa_debug.result @@ -201,6 +201,7 @@ xa start 'test1'; insert into t1 values(1); xa end 'test1'; xa prepare 'test1'; +FLUSH TABLES; xa recover; formatID gtrid_length bqual_length data 1 5 0 test1 diff --git a/mysql-test/suite/innodb/t/xa_debug.test b/mysql-test/suite/innodb/t/xa_debug.test index 5724891bb65..5e38ba1124b 100644 --- a/mysql-test/suite/innodb/t/xa_debug.test +++ b/mysql-test/suite/innodb/t/xa_debug.test @@ -20,6 +20,7 @@ dec $trial; connection default; # Kill and restart the server. +FLUSH TABLES; -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -- shutdown_server 0 -- source include/wait_until_disconnected.inc |