diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-04-07 17:42:15 +1000 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-04-07 10:44:06 +0200 |
| commit | acfa2c153106f1fd6a1c2a80f95e6513a2a4c0b7 (patch) | |
| tree | a0e730dcfd5f725d02f9af95f6be68d1c77a6933 | |
| parent | 4662b16c01ea5d2e6f22547aebf7bc9838943337 (diff) | |
| download | mariadb-git-bb-10.5-anel-PR1493.tar.gz | |
MDEV-22010: mtr fix encryption.innodb-force-corruptbb-10.5-anel-PR1493
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-force-corrupt.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-force-corrupt.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-force-corrupt.result b/mysql-test/suite/encryption/r/innodb-force-corrupt.result index 012901010b4..24829e5f526 100644 --- a/mysql-test/suite/encryption/r/innodb-force-corrupt.result +++ b/mysql-test/suite/encryption/r/innodb-force-corrupt.result @@ -1,7 +1,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version="); call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table"); -call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it"); +call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadb).*: Index for table 't2' is corrupt; try to repair it"); SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; # Create and populate tables to be corrupted diff --git a/mysql-test/suite/encryption/t/innodb-force-corrupt.test b/mysql-test/suite/encryption/t/innodb-force-corrupt.test index 8144f4597e2..33a41238859 100644 --- a/mysql-test/suite/encryption/t/innodb-force-corrupt.test +++ b/mysql-test/suite/encryption/t/innodb-force-corrupt.test @@ -10,7 +10,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version="); call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table"); -call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it"); +call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadb).*: Index for table 't2' is corrupt; try to repair it"); SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; |