summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/r/innodb-encryption-disable.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 16:24:52 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 16:24:52 +0200
commit1b471face8110b205b9bfb460c839127bc6862dd (patch)
tree305dd412d7b3f455919eb0eb4dbb6bf962df423e /mysql-test/suite/encryption/r/innodb-encryption-disable.result
parent171271edf8204d6a958a00631ea6ce4050f84b9e (diff)
downloadmariadb-git-1b471face8110b205b9bfb460c839127bc6862dd.tar.gz
MDEV-18025: Apply the fix to XtraDB and adjust tests
The fix was accidentally only applied to InnoDB, and encryption tests were not adjusted.
Diffstat (limited to 'mysql-test/suite/encryption/r/innodb-encryption-disable.result')
-rw-r--r--mysql-test/suite/encryption/r/innodb-encryption-disable.result1
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 4d15098d936..6b6aee2c7e3 100644
--- a/mysql-test/suite/encryption/r/innodb-encryption-disable.result
+++ b/mysql-test/suite/encryption/r/innodb-encryption-disable.result
@@ -1,4 +1,5 @@
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("InnoDB: Encrypted page [1-9][0-9]*: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,