From fb15ba799ce9aa3efa2f7e16b859ec5f402b63cc Mon Sep 17 00:00:00 2001 From: Eivin Hatvik Date: Tue, 6 Sep 2022 12:11:06 +0200 Subject: [PATCH 1/2] Fix auth_sec.keyring_file_data_qa test in docker Additional output from mysqld error log causing result content mismatch: 2022-08-23T11:31:00.065464Z 17 [ERROR] [MY-011370] [Server] Plugin keyring_file reported: 'Cannot seek in file '/' (OS errno 22 - Invalid argument)' --- mysql-test/suite/auth_sec/r/keyring_file_data_qa.result | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result b/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result index 22177b9727c2..2dd723338852 100644 --- a/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result +++ b/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result @@ -8,6 +8,7 @@ call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_fil call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring/' not found .*"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File '/' not found .*"); +call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Cannot seek in file '/'"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Incorrect Keyring file"); INSTALL PLUGIN keyring_file SONAME 'keyring_file.so'; SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS From 3847f4bf8b457efbd59f4bee40146baa3543ffbb Mon Sep 17 00:00:00 2001 From: Eivin Hatvik Date: Tue, 6 Sep 2022 12:20:13 +0200 Subject: [PATCH 2/2] Fix auth_sec.keyring_file_data_qa test in docker Additional output from mysqld error log causing result content mismatch: 2022-08-23T11:31:00.065464Z 17 [ERROR] [MY-011370] [Server] Plugin keyring_file reported: 'Cannot seek in file '/' (OS errno 22 - Invalid argument)' --- mysql-test/suite/auth_sec/t/keyring_file_data_qa.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test b/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test index cf3eb4ea9eb1..37d6382ca46e 100644 --- a/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test +++ b/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test @@ -12,6 +12,7 @@ call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_fil call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring/' not found .*"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File '/' not found .*"); +call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Cannot seek in file '/'"); call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Incorrect Keyring file"); # Installing keyring plugin.