summaryrefslogtreecommitdiffstats
path: root/mysqld-wait-ready
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-09-30 20:23:54 +0200
committerRemi Collet <fedora@famillecollet.com>2012-09-30 20:23:54 +0200
commit8fb1a350b6487602b62de069911750421c01c6ef (patch)
tree937ec25fc757b8022f99067c411cc57333639687 /mysqld-wait-ready
parent51fa9dd068780d91622704e3dbdafbaff0c03007 (diff)
MySQL: syncwith rawhide
Diffstat (limited to 'mysqld-wait-ready')
-rw-r--r--mysqld-wait-ready2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysqld-wait-ready b/mysqld-wait-ready
index 8fe99ec..9b0fd0c 100644
--- a/mysqld-wait-ready
+++ b/mysqld-wait-ready
@@ -31,7 +31,7 @@ socketfile="$result"
# Wait for the server to come up or for the mysqld process to disappear
ret=0
while /bin/true; do
- RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
+ RESPONSE=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
mret=$?
if [ $mret -eq 0 ]; then
break