From d352dbd5adecb302e67e07af5476dbf7412e0a09 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Mon, 28 Aug 2017 23:10:27 +0200
Subject: [PATCH] Sync mysql.init with community-mysql

---
 mariadb.spec  |  1 +
 mysql.init.in | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 5a8c118..efb28f2 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1464,6 +1464,7 @@ fi
 - Allow 4567 port for tcp as well
 - Install mysql-wait-ready on RHEL-6 for the SysV init
 - Run mysql-prepare-db-dir as non-root
+- Sync mysql.init with community-mysql
 
 * Sun Aug 20 2017 Honza Horak <hhorak@redhat.com> - 3:10.2.8-1
 - Rebase to 10.2.8
diff --git a/mysql.init.in b/mysql.init.in
index 01c5d5b..6ae046c 100644
--- a/mysql.init.in
+++ b/mysql.init.in
@@ -7,7 +7,7 @@
 # description:	MySQL database server.
 # processname: mysqld
 # config: @sysconfdir@/my.cnf
-# pidfile: /run/@DAEMON_NAME@/@DAEMON_NAME@.pid
+# pidfile: /var/run/@DAEMON_NAME@/@DAEMON_NO_PREFIX@.pid
 ### BEGIN INIT INFO
 # Provides: mysqld
 # Required-Start: $local_fs $remote_fs $network $named $syslog $time
@@ -60,14 +60,16 @@ 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
+	ret=0
     elif [ $MYSQLDRUNNING = 1 ] && echo "$RESPONSE" | grep -q "Access denied for user"
     then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
+	ret=0
     else
         @libexecdir@/mysql-check-socket || return 1
         su - $MYUSER -s /bin/bash -c "@libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP" || return 4
@@ -79,16 +81,24 @@ start(){
 	# and some users might prefer to configure logging to syslog.)
 	# Note: set --basedir to prevent probes that might trigger SELinux
 	# alarms, per bug #547485
-	$exec   --datadir="$datadir" --socket="$socketfile" \
-		--pid-file="$pidfile" \
-		--basedir=@prefix@ --user=$MYUSER >/dev/null 2>&1 &
+	su - $MYUSER -s /bin/bash -c "$exec   --datadir='$datadir' --socket='$socketfile' \
+		--pid-file='$pidfile' \
+		--basedir=@prefix@ --user=$MYUSER" >/dev/null 2>&1 &
 	safe_pid=$!
 
-        action $"Starting $prog: " /bin/true
-        chmod o+r $pidfile >/dev/null 2>&1
-        touch $lockfile
+	# Wait until the daemon is up
+	su - $MYUSER -s /bin/bash -c "@libexecdir@/mysql-wait-ready '$safe_pid'"
+	ret=$?
+
+	if [ $ret -eq 0 ]; then
+	    action $"Starting $prog: " /bin/true
+	    chmod o+r $pidfile >/dev/null 2>&1
+	    touch $lockfile
+	else
+	    action $"Starting $prog: " /bin/false
+	fi
     fi
-    return 0
+    return $ret
 }
 
 stop(){