summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2016-09-09 16:45:05 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2016-09-09 16:45:05 +0300
commitd8cbad069acd171c0b9d417fbda74aaf1f3c96a1 (patch)
tree357a28154a6a150a9fa020b91e32fcfe27b4e248
parentd3708f789d8215d065b7cd7623d8c3b4c3ec145f (diff)
downloadmariadb-git-d8cbad069acd171c0b9d417fbda74aaf1f3c96a1.tar.gz
More test case fixes.
-rw-r--r--mysql-test/suite/innodb/r/innodb-alter-discard.result1
-rw-r--r--mysql-test/suite/innodb/t/innodb-alter-discard.test2
-rw-r--r--mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small.test3
3 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-alter-discard.result b/mysql-test/suite/innodb/r/innodb-alter-discard.result
index bd60d2d0099..b05b905bc34 100644
--- a/mysql-test/suite/innodb/r/innodb-alter-discard.result
+++ b/mysql-test/suite/innodb/r/innodb-alter-discard.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression("InnoDB: Cannot open datafile for read-only: .*");
SET GLOBAL innodb_file_per_table=1;
CREATE TABLE t(a INT)ENGINE=InnoDB;
call mtr.add_suppression("InnoDB: Operating system error number .* in a file operation.");
diff --git a/mysql-test/suite/innodb/t/innodb-alter-discard.test b/mysql-test/suite/innodb/t/innodb-alter-discard.test
index 792882b51a5..19ba7c3a3ca 100644
--- a/mysql-test/suite/innodb/t/innodb-alter-discard.test
+++ b/mysql-test/suite/innodb/t/innodb-alter-discard.test
@@ -3,6 +3,8 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
+call mtr.add_suppression("InnoDB: Cannot open datafile for read-only: .*");
+
let $MYSQLD_DATADIR=`select @@datadir`;
SET GLOBAL innodb_file_per_table=1;
CREATE TABLE t(a INT)ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small.test b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small.test
index 1677a092e0c..79a16d36917 100644
--- a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small.test
+++ b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small.test
@@ -1,3 +1,6 @@
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+
--let $num_inserts = 1000
--let $num_ops = 30
--source suite/innodb/include/innodb_simulate_comp_failures.inc