Fixed failures in innodb tests caused by not flushed restart

- Fixed innodb.recovery_shutdown.test - Fixed innodb.instant_alter_rollback
MariaDB · Dec 22, 2017 · d9e9029 · d9e9029
1 parent 9cc7789
commit d9e9029
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/r/instant_alter_rollback.result b/mysql-test/suite/innodb/r/instant_alter_rollback.result
@@ -1,3 +1,4 @@
+FLUSH TABLES;
 #
 # MDEV-11369: Instant ADD COLUMN for InnoDB
 #

diff --git a/mysql-test/suite/innodb/r/recovery_shutdown.result b/mysql-test/suite/innodb/r/recovery_shutdown.result
@@ -1,3 +1,4 @@
+FLUSH TABLES;
 #
 # MDEV-13797 InnoDB may hang if shutdown is initiated soon after startup
 # while rolling back recovered incomplete transactions

diff --git a/mysql-test/suite/innodb/t/instant_alter_rollback.test b/mysql-test/suite/innodb/t/instant_alter_rollback.test
@@ -2,6 +2,9 @@
 # The embedded server tests do not support restarting.
 --source include/not_embedded.inc
 
+# Flush any open myisam tables from previous tests
+FLUSH TABLES;
+
 --echo #
 --echo # MDEV-11369: Instant ADD COLUMN for InnoDB
 --echo #

diff --git a/mysql-test/suite/innodb/t/recovery_shutdown.test b/mysql-test/suite/innodb/t/recovery_shutdown.test
@@ -1,6 +1,9 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
+# Flush any open myisam tables from previous tests
+FLUSH TABLES;
+
 --echo #
 --echo # MDEV-13797 InnoDB may hang if shutdown is initiated soon after startup
 --echo # while rolling back recovered incomplete transactions