[Commits] 5efb8f1: Filter out unix-socket from unrelated test cases

Sergey Vojtovich svoj at mariadb.org
Fri Dec 18 20:51:24 EET 2015


revision-id: 5efb8f1677f680e6d6ab2304630495c522475dc3 (mariadb-10.0.22-73-g5efb8f1)
parent(s): 3402f7a85364e26fe85dfff3b5d803a8497042aa
committer: Sergey Vojtovich
timestamp: 2015-12-18 22:51:12 +0400
message:

Filter out unix-socket from unrelated test cases

---
 mysql-test/suite/plugins/r/auth_v0100.result | 5 ++---
 mysql-test/suite/plugins/t/auth_v0100.test   | 3 ++-
 mysql-test/t/mysqld--help.test               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysql-test/suite/plugins/r/auth_v0100.result b/mysql-test/suite/plugins/r/auth_v0100.result
index 53affc9..a72b8e2 100644
--- a/mysql-test/suite/plugins/r/auth_v0100.result
+++ b/mysql-test/suite/plugins/r/auth_v0100.result
@@ -1,9 +1,8 @@
 install soname 'auth_0x0100';
-select plugin_name, plugin_type_version from information_schema.plugins where plugin_type='authentication' order by plugin_name;
+select plugin_name, plugin_type_version from information_schema.plugins where
+plugin_type='authentication' and plugin_library is not null order by plugin_name;
 plugin_name	plugin_type_version
 auth_0x0100	1.0
-mysql_native_password	2.0
-mysql_old_password	2.0
 create user tt identified via auth_0x0100;
 grant select on test.* to zzzzzzzzzzzzzzzz;
 connect(localhost,tt,,test,MASTER_MYPORT,MASTER_MYSOCK);
diff --git a/mysql-test/suite/plugins/t/auth_v0100.test b/mysql-test/suite/plugins/t/auth_v0100.test
index 3cf93ba..c4333d3 100644
--- a/mysql-test/suite/plugins/t/auth_v0100.test
+++ b/mysql-test/suite/plugins/t/auth_v0100.test
@@ -6,7 +6,8 @@ if (!$AUTH_0X0100_SO) {
 
 install soname 'auth_0x0100';
 
-select plugin_name, plugin_type_version from information_schema.plugins where plugin_type='authentication' order by plugin_name;
+select plugin_name, plugin_type_version from information_schema.plugins where
+plugin_type='authentication' and plugin_library is not null order by plugin_name;
 
 create user tt identified via auth_0x0100;
 grant select on test.* to zzzzzzzzzzzzzzzz;
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index c27fa58..fabc2e21 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -30,7 +30,7 @@ perl;
               thread-concurrency super-large-pages mutex-deadlock-detector
               connect null-audit aria oqgraph sphinx thread-handling
               test-sql-discovery rpl-semi-sync query-cache-info
-              query-response-time metadata-lock-info locales/;
+              query-response-time metadata-lock-info locales unix-socket/;
 
   # And substitute the content some environment variables with their
   # names:


More information about the commits mailing list