From 94e39a680ec5afea0da5c2a5964671a1a2578a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Fri, 27 Feb 2015 11:04:18 +0200 Subject: Use standard InnoDB error mechanism on compression and encryption error messages. --- mysql-test/suite/innodb/r/innodb-page_compression_snappy.result | 2 +- mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result | 2 ++ mysql-test/suite/innodb/t/innodb-page_compression_snappy.test | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result b/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result index 1709d8e9d2b..a0b2f947fd3 100644 --- a/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result +++ b/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result @@ -1,4 +1,4 @@ -call mtr.add_suppression("InnoDB: Warning: Compression failed for space*"); +call mtr.add_suppression("Compression failed for space*"); set global innodb_file_format = `barracuda`; set global innodb_file_per_table = on; set global innodb_compression_algorithm = 6; diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result b/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result index 62f07778d5a..03a8c658225 100644 --- a/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result +++ b/mysql-test/suite/innodb/r/innodb-page_encryption_log_encryption.result @@ -1,5 +1,7 @@ call mtr.add_suppression("KeyID 0 not found or with error. Check the key and the log file*"); call mtr.add_suppression("Disabling redo log encryption"); +call mtr.add_suppression("InnoDB: [Warning] Disabling redo log encryption"); +call mtr.add_suppression("InnoDB:*"); SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test b/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test index 8c4980ff479..929f547b6ac 100644 --- a/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test +++ b/mysql-test/suite/innodb/t/innodb-page_compression_snappy.test @@ -1,7 +1,7 @@ -- source include/have_innodb.inc -- source include/have_innodb_snappy.inc -call mtr.add_suppression("InnoDB: Warning: Compression failed for space*"); +call mtr.add_suppression("Compression failed for space*"); --disable_query_log let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`; -- cgit v1.2.1