diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-18 22:51:12 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-18 22:51:12 +0400 |
| commit | 5efb8f1677f680e6d6ab2304630495c522475dc3 (patch) | |
| tree | 2d2f7d1e54f67b7080b66210cad1f7566977d27f | |
| parent | 3402f7a85364e26fe85dfff3b5d803a8497042aa (diff) | |
| download | mariadb-git-5efb8f1677f680e6d6ab2304630495c522475dc3.tar.gz | |
Filter out unix-socket from unrelated test cases
| -rw-r--r-- | mysql-test/suite/plugins/r/auth_v0100.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/auth_v0100.test | 3 | ||||
| -rw-r--r-- | 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 53affc94947..a72b8e209b0 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 3cf93ba67f2..c4333d376d3 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 c27fa58f935..fabc2e21f18 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: |