diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-24 08:40:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-24 08:40:16 +0200 |
| commit | 71dedd0ebcd6c2c9735c2a55474725b38b8c2912 (patch) | |
| tree | 0ac2e17e8fd03710bccf606aece4eb15c4348659 /mysql-test/suite/encryption | |
| parent | 7933367a27b572d5cd02972e00dfe3303d59d5f4 (diff) | |
| parent | fc0120d184241dcd3688c096de01ac95a3ded962 (diff) | |
| download | mariadb-git-71dedd0ebcd6c2c9735c2a55474725b38b8c2912.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-redo-nokeys.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-redo-nokeys.test | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result index 88b5c583f61..026a7cd3f42 100644 --- a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result +++ b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result @@ -1,6 +1,6 @@ -call mtr.add_suppression("mariadbd.*: File .*"); -call mtr.add_suppression("Plugin 'file_key_management' .*"); -call mtr.add_suppression("InnoDB: We do not continue the crash recovery"); +call mtr.add_suppression("mariadbd.*: File "); +call mtr.add_suppression("Plugin 'file_key_management' "); +call mtr.add_suppression("InnoDB: Recovery cannot access file"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\."); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed."); diff --git a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test index 866b02b58c0..d3088204b96 100644 --- a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test +++ b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test @@ -3,9 +3,9 @@ # embedded does not support restart -- source include/not_embedded.inc -call mtr.add_suppression("mariadbd.*: File .*"); -call mtr.add_suppression("Plugin 'file_key_management' .*"); -call mtr.add_suppression("InnoDB: We do not continue the crash recovery"); +call mtr.add_suppression("mariadbd.*: File "); +call mtr.add_suppression("Plugin 'file_key_management' "); +call mtr.add_suppression("InnoDB: Recovery cannot access file"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\."); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed."); |