From 8428c116c7cc1fb6a04345637a10084810874dd8 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Thu, 13 Mar 2014 20:12:50 +0100
Subject: [PATCH] don't run unix_socket tests when $USER is already present in
 mysql.user (as it's done in 10.0)

---
 mysql-test/include/have_unix_socket.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/include/have_unix_socket.inc b/mysql-test/include/have_unix_socket.inc
index 6e4c3b9826b..4246b138e9d 100644
--- a/mysql-test/include/have_unix_socket.inc
+++ b/mysql-test/include/have_unix_socket.inc
@@ -8,3 +8,6 @@ if (!$USER) {
   skip USER variable is undefined;
 }
 
+if (`SELECT count(*) <> 0 FROM mysql.user WHERE user = '$USER'`) {
+  skip \$USER=$USER which exists in mysql.user;
+}