summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-01-27 12:21:31 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-01-27 12:21:31 +0200
commit8daa87dc064e1d32e1b27dd809cf8dc4489352d0 (patch)
tree40a4365c93dc86737a9e9e469a97e40225bae564
parent4ee7174479932034ce6b9dd4abfbb26d275b52bf (diff)
downloadmariadb-git-8daa87dc064e1d32e1b27dd809cf8dc4489352d0.tar.gz
Fix a test.
-rw-r--r--mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc2
-rw-r--r--mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result1
-rw-r--r--mysql-test/suite/innodb/r/innodb_simulate_comp_failures_small.result1
3 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc b/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc
index 6aaa9cd07a9..d9c0294faf5 100644
--- a/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc
+++ b/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc
@@ -7,7 +7,7 @@
--let $simulate_comp_failures_save = `SELECT @@innodb_simulate_comp_failures`
-# since this test generates lot of errors in log, suppress checking errors
+--disable_query_log
call mtr.add_suppression("InnoDB: Simulating a compression failure for table `test`\\.`t1`");
--enable_query_log
diff --git a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result
index 4ed6ca14f26..f35e4159603 100644
--- a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result
+++ b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result
@@ -1,7 +1,6 @@
#
# Testing robustness against random compression failures
#
-call mtr.add_suppression("InnoDB: Simulating a compression failure for table `test`\\.`t1`");
CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, msg VARCHAR(255), KEY msg_i(msg)) ENGINE=INNODB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
SHOW CREATE TABLE t1;
Table Create Table
diff --git a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures_small.result b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures_small.result
index cc61f811e62..099c673bca7 100644
--- a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures_small.result
+++ b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures_small.result
@@ -1,7 +1,6 @@
#
# Testing robustness against random compression failures
#
-call mtr.add_suppression(".*");
CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, msg VARCHAR(255), KEY msg_i(msg)) ENGINE=INNODB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
SHOW CREATE TABLE t1;
Table Create Table