From da4e0638bdce0940de11fe8905f7db3f4c10c2f7 Mon Sep 17 00:00:00 2001
From: Honza Horák <hhorak@redhat.com>
Date: Nov 22 2013 12:57:21 +0000
Subject: Check if correct process is running in mysql-wait-ready script

Related: #1026313

---

diff --git a/mariadb.spec b/mariadb.spec
index 1ee4382..55eddfa 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -772,6 +772,8 @@ fi
 * Mon Nov  4 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-3
 - Add pam-devel to build-requires in order to build
   Related: #1019945
+- Check if correct process is running in mysql-wait-ready script
+  Related: #1026313
 
 * Thu Oct 10 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-1
 - Rebase to 5.5.33a
diff --git a/mysqld-wait-ready b/mysqld-wait-ready
index 9e5d3e4..ead58e0 100644
--- a/mysqld-wait-ready
+++ b/mysqld-wait-ready
@@ -27,13 +27,22 @@ get_mysql_option mysqld datadir "/var/lib/mysql"
 datadir="$result"
 get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock"
 socketfile="$result"
+get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
+mypidfile="$result"
 
 # Wait for the server to come up or for the mysqld process to disappear
 ret=0
 while /bin/true; do
+	MYSQLDRUNNING=0
+	if [ -f "$mypidfile" ]; then
+	    MYSQLPID=`cat "$mypidfile" 2>/dev/null`
+	    if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
+		MYSQLDRUNNING=1
+	    fi
+	fi
 	RESPONSE=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
 	mret=$?
-	if [ $mret -eq 0 ]; then
+	if [ $mret -eq 0 ] && [ $MYSQLDRUNNING -eq 1 ]; then
 	    break
 	fi
 	# exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected,