summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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--storage/innobase/page/page0zip.cc5
3 files changed, 4 insertions, 4 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 28f2b7d1000..6aaa9cd07a9 100644
--- a/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc
+++ b/mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc
@@ -8,7 +8,7 @@
--let $simulate_comp_failures_save = `SELECT @@innodb_simulate_comp_failures`
# since this test generates lot of errors in log, suppress checking errors
-call mtr.add_suppression(".*");
+call mtr.add_suppression("InnoDB: Simulating a compression failure for table `test`\\.`t1`");
--enable_query_log
# create the table with compressed pages of size 8K.
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 f35e4159603..4ed6ca14f26 100644
--- a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result
+++ b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result
@@ -1,6 +1,7 @@
#
# 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/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc
index 35ef24c16a6..d49cecdb968 100644
--- a/storage/innobase/page/page0zip.cc
+++ b/storage/innobase/page/page0zip.cc
@@ -1388,9 +1388,8 @@ page_zip_compress(
#ifdef UNIV_DEBUG
ib::error()
- << "InnoDB: Simulating a compression failure"
- << " for table "
- << (index->table->name.m_name)
+ << "Simulating a compression failure"
+ << " for table " << index->table->name
<< " index "
<< index->name()
<< " page "