From 1108c1ca5c1d71bb9ca39a463a4f0465b23350b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 28 Oct 2015 14:30:30 +0200 Subject: [PATCH] MDEV-8950: encryption.innodb_encryption_discard_import fails sporadically in buildbot At least some of the failures where due to fact that TMPDIR contained old file. --- .../t/innodb_encryption_discard_import.test | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test b/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test index 70f937f0832..bb361a9ffab 100644 --- a/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test +++ b/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test @@ -70,6 +70,20 @@ FLUSH TABLE t1, t2, t3 FOR EXPORT; --echo # List before copying files --list_files $MYSQLD_DATADIR/test +--disable_result_log +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t1.cfg +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t1.ibd +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t2.cfg +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t2.ibd +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t3.cfg +--error 0,1,2 +--remove_file $MYSQLD_TMPDIR/t3.ibd +--enable_result_log --copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_TMPDIR/t1.cfg --copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_TMPDIR/t1.ibd --copy_file $MYSQLD_DATADIR/test/t2.cfg $MYSQLD_TMPDIR/t2.cfg @@ -108,6 +122,7 @@ ALTER TABLE t3 DISCARD TABLESPACE; --echo # List after t1 DISCARD --list_files $MYSQLD_DATADIR/test + --copy_file $MYSQLD_TMPDIR/t1.cfg $MYSQLD_DATADIR/test/t1.cfg --copy_file $MYSQLD_TMPDIR/t1.ibd $MYSQLD_DATADIR/test/t1.ibd --copy_file $MYSQLD_TMPDIR/t2.cfg $MYSQLD_DATADIR/test/t2.cfg