5.2 merge

cfc83cf9 · Sergei Golubchik · 5c8ed7dd · 8428c116 · cfc83cf9
Commit cfc83cf9 authored Mar 16, 2014 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

mysql-test/include/have_unix_socket.inc mysql-test/include/have_unix_socket.inc +3 -0

No files found.
--- 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;
+}