summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-06 19:08:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-06 19:10:12 +0300
commitc59a52b7bad473a162a51000f2a24507c83b5fc8 (patch)
tree5705e60e339d53d628759313b9fc51a100c229e7
parentb429e8cada73033611159ef9f02b54ad7afd888a (diff)
downloadmariadb-git-c59a52b7bad473a162a51000f2a24507c83b5fc8.tar.gz
Fix nondeterministic failure of innodb.table_flags
The files ibtmp1 and ib_buffer_pool are sometimes created, sometimes not. Remove them if they exist.
-rw-r--r--mysql-test/suite/innodb/r/table_flags.result1
-rw-r--r--mysql-test/suite/innodb/t/table_flags.test5
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/table_flags.result b/mysql-test/suite/innodb/r/table_flags.result
index 5cf163ba4ae..435fe8fc45e 100644
--- a/mysql-test/suite/innodb/r/table_flags.result
+++ b/mysql-test/suite/innodb/r/table_flags.result
@@ -174,7 +174,6 @@ a
SELECT * FROM tp;
a
DROP TABLE tr,tc,td,tz,tp;
-ib_buffer_pool
ib_logfile0
ib_logfile1
ibdata1
diff --git a/mysql-test/suite/innodb/t/table_flags.test b/mysql-test/suite/innodb/t/table_flags.test
index d3dafa22318..b8ccc4ce4b6 100644
--- a/mysql-test/suite/innodb/t/table_flags.test
+++ b/mysql-test/suite/innodb/t/table_flags.test
@@ -194,6 +194,11 @@ DROP TABLE tr,tc,td,tz,tp;
--let $restart_parameters=
--source include/restart_mysqld.inc
+--error 0,1
+--remove_file $bugdir/ibtmp1
+--error 0,1
+--remove_file $bugdir/ib_buffer_pool
+
--list_files $bugdir
--remove_files_wildcard $bugdir
--rmdir $bugdir