MDEV-22010: Allow mariadbd in mtr suppressions

6 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/suite/encryption/r/innodb-force-corrupt.result b/mysql-test/suite/encryption/r/innodb-force-corrupt.result
index 24829e5f526..ad75df952b3 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|mariadb).*: Index for table 't2' is corrupt; try to repair it");
+call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadbd).*: 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/r/innodb-redo-nokeys.result b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result
index 0a6beb8da38..fe5324d7012 100644
--- a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result
+++ b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result
@@ -1,4 +1,4 @@
-call mtr.add_suppression("mysqld: File .*");
+call mtr.add_suppression("(mysqld|mariadbd).*: File .*");
 call mtr.add_suppression("Plugin 'file_key_management' .*");
 call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available");
 call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption.result b/mysql-test/suite/encryption/r/innodb-remove-encryption.result
index 08b31cb568d..cf836f8b2ed 100644
--- a/mysql-test/suite/encryption/r/innodb-remove-encryption.result
+++ b/mysql-test/suite/encryption/r/innodb-remove-encryption.result
@@ -1,5 +1,5 @@
 set global innodb_file_per_table=OFF;
-call mtr.add_suppression("mysqld: file-key-management-filename is not set");
+call mtr.add_suppression("(mysqld|mariadbd).*: file-key-management-filename is not set");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error.");
 call mtr.add_suppression("Plugin 'file_key_management' registration as a ENCRYPTION failed.");
 flush tables;
diff --git a/mysql-test/suite/encryption/t/innodb-force-corrupt.test b/mysql-test/suite/encryption/t/innodb-force-corrupt.test
index 33a41238859..51771f1e14b 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|mariadb).*: Index for table 't2' is corrupt; try to repair it");
+call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadbd).*: Index for table 't2' is corrupt; try to repair it");
 
 SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
diff --git a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test
index 6fa28cd8ca8..3cd331a1019 100644
--- a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test
+++ b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test
@@ -3,7 +3,7 @@
 # embedded does not support restart
 -- source include/not_embedded.inc
 
-call mtr.add_suppression("mysqld: File .*");
+call mtr.add_suppression("(mysqld|mariadbd).*: File .*");
 call mtr.add_suppression("Plugin 'file_key_management' .*");
 call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available");
 call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
diff --git a/mysql-test/suite/encryption/t/innodb-remove-encryption.test b/mysql-test/suite/encryption/t/innodb-remove-encryption.test
index 24e00a00a02..90c6925d125 100644
--- a/mysql-test/suite/encryption/t/innodb-remove-encryption.test
+++ b/mysql-test/suite/encryption/t/innodb-remove-encryption.test
@@ -9,7 +9,7 @@
 
 set global innodb_file_per_table=OFF;
 
-call mtr.add_suppression("mysqld: file-key-management-filename is not set");
+call mtr.add_suppression("(mysqld|mariadbd).*: file-key-management-filename is not set");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error.");
 call mtr.add_suppression("Plugin 'file_key_management' registration as a ENCRYPTION failed.");
 flush tables;