diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:26:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:26:44 +0200 |
| commit | 9216a4f69f113390cc55bd9c58c9f347ef4321c7 (patch) | |
| tree | fdeb0d114bf23acd583d37de1728e748583ee703 | |
| parent | 5421e3aee7b44c3c400c5dc82b8af00436790ab0 (diff) | |
| download | mariadb-git-9216a4f69f113390cc55bd9c58c9f347ef4321c7.tar.gz | |
Make the test innodb.recovery_shutdown more robust
Before killing the server, we have to FLUSH TABLES in order to
prevent the corruption of any MyISAM system tables.
| -rw-r--r-- | mysql-test/suite/innodb/r/recovery_shutdown.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/recovery_shutdown.test | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/recovery_shutdown.result b/mysql-test/suite/innodb/r/recovery_shutdown.result index 861461dd072..47398c1ca23 100644 --- a/mysql-test/suite/innodb/r/recovery_shutdown.result +++ b/mysql-test/suite/innodb/r/recovery_shutdown.result @@ -52,5 +52,5 @@ INSERT INTO t1(a) SELECT NULL FROM t1; INSERT INTO t1(a) SELECT NULL FROM t1; SET GLOBAL innodb_flush_log_at_trx_commit=1; CREATE TABLE u(a SERIAL) ENGINE=INNODB; -# Kill and restart +FLUSH TABLES; DROP TABLE t,u; diff --git a/mysql-test/suite/innodb/t/recovery_shutdown.test b/mysql-test/suite/innodb/t/recovery_shutdown.test index 28b80cd3818..42d98ca34c7 100644 --- a/mysql-test/suite/innodb/t/recovery_shutdown.test +++ b/mysql-test/suite/innodb/t/recovery_shutdown.test @@ -41,7 +41,11 @@ INSERT INTO t1(a) SELECT NULL FROM t1; SET GLOBAL innodb_flush_log_at_trx_commit=1; CREATE TABLE u(a SERIAL) ENGINE=INNODB; ---source include/kill_and_restart_mysqld.inc +FLUSH TABLES; + +--let $shutdown_timeout=0 +--source include/restart_mysqld.inc +--let $shutdown_timeout=60 --source include/restart_mysqld.inc --disable_query_log |