1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test failing when file_key_management_plugin doesn't load

Browse Source 
* 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
This commit is contained in:
Sergei Golubchik 2015-03-01 16:51:34 +01:00
parent c3f80a2bff
commit 1f1f977167
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/mysql-test-run.pl
View File

@ -4386,6 +4386,7 @@ sub extract_warning_lines ($$) {
qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/,
qr/InnoDB: Warning: Setting innodb_use_sys_malloc/,
qr/InnoDB: Warning: a long semaphore wait:/,
qr/InnoDB: Warning: Disabling redo log encryption/,
qr/Slave: Unknown table 't1' .* 1051/,
qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/,
qr/slave SQL thread aborted/,

2
mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test
View File

@ -8,8 +8,6 @@ let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
call mtr.add_suppression("KeyID 0 not found or with error. Check the key and the log file*");
call mtr.add_suppression("Disabling redo log encryption");
call mtr.add_suppression("InnoDB: [Warning] Disabling redo log encryption");
call mtr.add_suppression("InnoDB:*");
SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;