MDEV-22010: Allow mariadbd in mtr suppressions

MariaDB · Apr 7, 2020 · 0eab87c · 0eab87c
1 parent 1738c0f
commit 0eab87c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

diff --git a/mysql-test/suite/innodb/t/leaf_page_corrupted_during_recovery.test b/mysql-test/suite/innodb/t/leaf_page_corrupted_during_recovery.test
@@ -8,7 +8,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to read file '.*test.t1\\.i
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Plugin initialization aborted at srv0start\\.cc.* with error Data structure corruption");
 call mtr.add_suppression("\\[ERROR\\] Plugin 'InnoDB' (init function|registration)");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption");
-call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't1' is corrupt; try to repair it");
+call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadbd).*: Index for table 't1' is corrupt; try to repair it");
 call mtr.add_suppression("InnoDB:  Error code: [0-9][0-9][0-9]* btr_pcur_open_low  level: 0 called from file: ");
 --enable_query_log
 CREATE TABLE t1 (pk INT PRIMARY KEY, c CHAR(255))ENGINE=InnoDB STATS_PERSISTENT=0;