hhorak pushed to community-mysql (f22). "Use --no-defaults when checking server status before starting"

[notifications at fedoraproject.org]

>From 82d026ef2959035fa0b6626c3540760f10aeabbe Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak at redhat.com>
Date: Mon, 23 Feb 2015 14:40:08 +0100
Subject: Use --no-defaults when checking server status before starting


diff --git a/community-mysql.spec b/community-mysql.spec
index 3e6dba6..df3cf6d 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -940,6 +940,7 @@ fi
 * Mon Feb 23 2015 Honza Horak <hhorak at redhat.com> - 5.6.23-3
 - Expand paths in perl scripts in mysql-test
 - Use correct path in install_db script warning
+- Use --no-defaults when checking server status before starting
 
 * Thu Jan 29 2015 Bjorn Munch <bjorn.munch at oracle.com> - 5.6.23-1
 - Update to MySQL 5.6.23, for various fixes described at
diff --git a/mysql.init.in b/mysql.init.in
index be34fbf..475fa72 100644
--- a/mysql.init.in
+++ b/mysql.init.in
@@ -53,7 +53,7 @@ start(){
 	    MYSQLDRUNNING=1
 	fi
     fi
-    RESPONSE=`@bindir@/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
+    RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
     if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/community-mysql.git/commit/?h=f22&id=82d026ef2959035fa0b6626c3540760f10aeabbe