Skip to content

Commit 1f1f977

Browse files
committed
Fix test failing when file_key_management_plugin doesn't load
* remove useless suppressions from the test file, when a plugin doesn't load, the file isn't executed anyway * add the suppression to mysql-test-run.pl instead
1 parent c3f80a2 commit 1f1f977

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4386,6 +4386,7 @@ ($$)
43864386
qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/,
43874387
qr/InnoDB: Warning: Setting innodb_use_sys_malloc/,
43884388
qr/InnoDB: Warning: a long semaphore wait:/,
4389+
qr/InnoDB: Warning: Disabling redo log encryption/,
43894390
qr/Slave: Unknown table 't1' .* 1051/,
43904391
qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/,
43914392
qr/slave SQL thread aborted/,

mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
88

99
call mtr.add_suppression("KeyID 0 not found or with error. Check the key and the log file*");
1010
call mtr.add_suppression("Disabling redo log encryption");
11-
call mtr.add_suppression("InnoDB: [Warning] Disabling redo log encryption");
12-
call mtr.add_suppression("InnoDB:*");
1311

1412
SET GLOBAL innodb_file_format = `Barracuda`;
1513
SET GLOBAL innodb_file_per_table = ON;

0 commit comments

Comments
 (0)