summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-13 20:12:50 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-13 20:12:50 +0100
commit8428c116c7cc1fb6a04345637a10084810874dd8 (patch)
tree23882f2d876cdd52648a23fbac8c7fc2bc4698ea
parent5616bd55973cd1c4f4005e7033e7adff7397214d (diff)
downloadmariadb-git-8428c116c7cc1fb6a04345637a10084810874dd8.tar.gz
don't run unix_socket tests when $USER is already present in mysql.user
(as it's done in 10.0)
-rw-r--r--mysql-test/include/have_unix_socket.inc3
1 files changed, 3 insertions, 0 deletions
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;
+}