From 18830d78a3796076747278afe9c85b48531f8f9c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Thu, 13 Mar 2014 16:34:34 +0100
Subject: mtr: move if(unix_socket) test to include/have_unix_socket.inc

---
 mysql-test/include/have_unix_socket.inc     | 10 ++++++++++
 mysql-test/suite/plugins/t/unix_socket.test |  6 +-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 mysql-test/include/have_unix_socket.inc

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`;
 
-- 
cgit v1.2.1