Commit 1f1f9771 authored by Sergei Golubchik's avatar Sergei Golubchik

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
parent c3f80a2b
...@@ -4386,6 +4386,7 @@ sub extract_warning_lines ($$) { ...@@ -4386,6 +4386,7 @@ sub extract_warning_lines ($$) {
qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/, 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: Setting innodb_use_sys_malloc/,
qr/InnoDB: Warning: a long semaphore wait:/, qr/InnoDB: Warning: a long semaphore wait:/,
qr/InnoDB: Warning: Disabling redo log encryption/,
qr/Slave: Unknown table 't1' .* 1051/, qr/Slave: Unknown table 't1' .* 1051/,
qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/, qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/,
qr/slave SQL thread aborted/, qr/slave SQL thread aborted/,
......
...@@ -8,8 +8,6 @@ let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`; ...@@ -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("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("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_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_file_per_table = ON;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment