diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-13 16:34:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-13 16:34:34 +0100 |
| commit | 18830d78a3796076747278afe9c85b48531f8f9c (patch) | |
| tree | 8c0b57290f5f70f604cc0903b919554f9ada3270 | |
| parent | 627005d825a28c5da3cd4623ae66aa612b28e964 (diff) | |
| download | mariadb-git-18830d78a3796076747278afe9c85b48531f8f9c.tar.gz | |
mtr: move if(unix_socket) test to include/have_unix_socket.inc
| -rw-r--r-- | mysql-test/include/have_unix_socket.inc | 10 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/unix_socket.test | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mysql-test/include/have_unix_socket.inc b/mysql-test/include/have_unix_socket.inc new file mode 100644 index 00000000000..6e4c3b9826b --- /dev/null +++ b/mysql-test/include/have_unix_socket.inc @@ -0,0 +1,10 @@ +--source include/not_embedded.inc + +if (!$AUTH_SOCKET_SO) { + skip No unix_socket plugin; +} + +if (!$USER) { + skip USER variable is undefined; +} + diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test index fc2e6c5b3c6..3ce1d0323fb 100644 --- a/mysql-test/suite/plugins/t/unix_socket.test +++ b/mysql-test/suite/plugins/t/unix_socket.test @@ -1,8 +1,4 @@ ---source include/not_embedded.inc - -if (!$AUTH_SOCKET_SO) { - skip No auth_socket plugin; -} +--source include/have_unix_socket.inc let $plugindir=`SELECT @@global.plugin_dir`; |