summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/r/innodb-force-corrupt.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 09:15:41 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 09:15:41 +0200
commit45531949ae115f2ba7b9450cc2386653483211ba (patch)
tree22809f3919c711d5030d2d0e55be969a7bc67e84 /mysql-test/suite/encryption/r/innodb-force-corrupt.result
parent36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff)
parented13a0d221256028299df4167280e97860ba2edc (diff)
downloadmariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/encryption/r/innodb-force-corrupt.result')
-rw-r--r--mysql-test/suite/encryption/r/innodb-force-corrupt.result3
1 files changed, 1 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 4c8ee2ef4de..13c38f1587d 100644
--- a/mysql-test/suite/encryption/r/innodb-force-corrupt.result
+++ b/mysql-test/suite/encryption/r/innodb-force-corrupt.result
@@ -1,6 +1,5 @@
call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)");
-call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\.");
-call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
+call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version=3221342974");
SET GLOBAL innodb_file_per_table = ON;
set global innodb_compression_algorithm = 1;
# Create and populate tables to be corrupted