From 1f1f977167c7e749a4f906a878157978907551b0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 1 Mar 2015 16:51:34 +0100 Subject: [PATCH] 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 --- mysql-test/mysql-test-run.pl | 1 + .../suite/innodb/t/innodb-page_encryption_log_encryption.test | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 47f227209c5..fe7303dde70 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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/, diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test b/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test index 80e3447870e..c2f67dbe5b5 100644 --- a/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test +++ b/mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.test @@ -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;