diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 16:28:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 16:28:19 +0200 |
| commit | 560df4792696a61d2ad7a191c1ea45dff11915e9 (patch) | |
| tree | 1808aeb49b7f53e34eda3020069e1eb4742be521 /mysql-test/suite/encryption/r/innodb-encryption-disable.result | |
| parent | 977073e3dccd32c36d59a0a9dc4d9f8e0331f7c0 (diff) | |
| parent | 1b471face8110b205b9bfb460c839127bc6862dd (diff) | |
| download | mariadb-git-560df4792696a61d2ad7a191c1ea45dff11915e9.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/encryption/r/innodb-encryption-disable.result')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-encryption-disable.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-encryption-disable.result b/mysql-test/suite/encryption/r/innodb-encryption-disable.result index 4ccacd4293c..3b3d6712817 100644 --- a/mysql-test/suite/encryption/r/innodb-encryption-disable.result +++ b/mysql-test/suite/encryption/r/innodb-encryption-disable.result @@ -1,5 +1,6 @@ call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.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=[1-9][0-9]*, page number=3\\] in file .*test.t[15].ibd looks corrupted; key_version=1"); call mtr.add_suppression("Couldn't load plugins from 'file_key_management"); create table t5 ( `intcol1` int(32) DEFAULT NULL, |