diff --git a/rgmanager/src/resources/mysql.sh b/rgmanager/src/resources/mysql.sh
index 736a91a8c..c4ec8ba2b 100755
--- a/rgmanager/src/resources/mysql.sh
+++ b/rgmanager/src/resources/mysql.sh
@@ -1,221 +1,232 @@
 #!/bin/bash
 #
 # Copyright (C) 1997-2003 Sistina Software, Inc.  All rights reserved.
 # Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
 export LC_ALL=C
 export LANG=C
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 . $(dirname $0)/ocf-shellfuncs
 . $(dirname $0)/utils/config-utils.sh
 . $(dirname $0)/utils/messages.sh
 . $(dirname $0)/utils/ra-skelet.sh
 
 declare MYSQL_MYSQLD=/usr/bin/mysqld_safe
 declare MYSQL_ipAddress
 declare MYSQL_pid_file="`generate_name_for_pid_file`"
 
 verify_all()
 {
 	clog_service_verify $CLOG_INIT
 
 	if [ -z "$OCF_RESKEY_name" ]; then
 		clog_service_verify $CLOG_FAILED "Invalid Name Of Service"
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$OCF_RESKEY_service_name" ]; then
 		clog_service_verify $CLOG_FAILED_NOT_CHILD
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$OCF_RESKEY_config_file" ]; then
 		clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ ! -r "$OCF_RESKEY_config_file" ]; then
 		clog_check_file_exist $CLOG_FAILED_NOT_READABLE $OCF_RESKEY_config_file
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$MYSQL_pid_file" ]; then
 		clog_service_verify $CLOG_FAILED "Invalid name of PID file"
 		return $OCF_ERR_ARGS
 	fi
 
 	clog_service_verify $CLOG_SUCCEED
 	return 0
 }
 
 start()
 {
 	declare username=""
 
         if status; then
                 ocf_log info "Starting Service $OCF_RESOURCE_INSTANCE > Already running"
                 return $OCF_SUCCESS
         fi
 
 	clog_service_start $CLOG_INIT
 
 	# Pull out the user name from the options argument if it is set.
 	# We need this to properly set the pidfile permissions
 	if [ -n "$OCF_RESKEY_mysqld_options" ]; then
 		username=$(echo "$OCF_RESKEY_mysqld_options" | sed -n -e 's/^.*--user=\(\S*\)[[:space:]]*.*$/\1/p;s/^.*-u[[:space:]]*\(\S*\)[[:space:]]*.*$/\1/p')
 	fi
 
 	create_pid_directory "$username"
 	check_pid_file "$MYSQL_pid_file"
 
 	if [ $? -ne 0 ]; then
 		clog_check_pid $CLOG_FAILED "$MYSQL_pid_file"
 		clog_service_start $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 
 	if [ -n "$OCF_RESKEY_listen_address" ]; then
 		MYSQL_ipAddress="$OCF_RESKEY_listen_address"
 	else
 		clog_looking_for $CLOG_INIT "IP Address"
 
 	        get_service_ip_keys "$OCF_RESKEY_service_name"
 	        ip_addresses=`build_ip_list`
 
 		if [ -n "$ip_addresses" ]; then
 			for i in $ip_addresses; do
 				MYSQL_ipAddress="$i"
 				break;
 			done
 		else
 			clog_looking_for $CLOG_FAILED_NOT_FOUND "IP Address"
 		fi
 	fi
 
 	clog_looking_for $CLOG_SUCCEED "IP Address"
 
 	$MYSQL_MYSQLD --defaults-file="$OCF_RESKEY_config_file" \
 		--pid-file="$MYSQL_pid_file" \
 		--bind-address="$MYSQL_ipAddress" \
 		$OCF_RESKEY_mysqld_options > /dev/null 2>&1 &
 
 	if [ $? -ne 0 ]; then
 		clog_service_start $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 
-	declare i=$OCF_RESKEY_startup_wait
-	while [ "$i" -gt 0 ]; do
-		if [ -f "$MYSQL_pid_file" ]; then
-			break;			
-		fi
-		sleep 1
-		let i=$i-1
-        done
-
-        if [ "$i" -eq 0 ]; then
-		clog_service_start $CLOG_FAILED_TIMEOUT
-		return $OCF_ERR_GENERIC
-	fi
-	
 	clog_service_start $CLOG_SUCCEED
 
-	return 0;
+	# Sleep 1 sec before checking status so mysqld can start
+	sleep 1
+
+	status
+
+	return $?;
 }
 
 stop()
 {
 	clog_service_stop $CLOG_INIT
 
 	stop_generic "$MYSQL_pid_file" "$OCF_RESKEY_shutdown_wait"
 	
 	if [ $? -ne 0 ]; then
 		clog_service_stop $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 	
 	clog_service_stop $CLOG_SUCCEED
 	return 0;
 }
 
 status()
 {
 	clog_service_status $CLOG_INIT
 
 	status_check_pid "$MYSQL_pid_file"
 	case $? in
-		$OCF_NOT_RUNNING)
+	$OCF_NOT_RUNNING)
+		ps auxww | grep -Pv "grep|$MYSQL_MYSQLD" | grep "$MYSQL_pid_file" &> /dev/null
+		if [ "$?" -eq "0" ];then
+			declare i=$OCF_RESKEY_startup_wait
+			while [ "$i" -gt 0 ]; do
+				if [ -f "$MYSQL_pid_file" ]; then
+					break;
+				fi
+				sleep 1
+				let i=$i-1
+			done
+
+			if [ "$i" -eq 0 ]; then
+				clog_service_start $CLOG_FAILED_TIMEOUT
+				return $OCF_ERR_GENERIC
+			else
+				clog_service_status $CLOG_SUCCEED
+				exit 0
+			fi
+		fi
+
 		clog_service_status $CLOG_FAILED "$MYSQL_pid_file"
 		return $OCF_NOT_RUNNING
 		;;
 	0)
 		clog_service_status $CLOG_SUCCEED
 		exit 0
 		;;
 	*)
 		clog_service_status $CLOG_FAILED "$MYSQL_pid_file"
 		return $OCF_ERR_GENERIC
 		;;
 	esac
 
 		
 	if [ $? -ne 0 ]; then
 		clog_service_status $CLOG_FAILED "$MYSQL_pid_file"
 		return $OCF_ERR_GENERIC
 	fi
 
 	clog_service_status $CLOG_SUCCEED
 	return 0
 }
 
 case $1 in
 	meta-data)
 		cat `echo $0 | sed 's/^\(.*\)\.sh$/\1.metadata/'`
 		exit 0
 		;;
 	validate-all)
 		verify_all
 		exit $?
 		;;
 	start)
 		verify_all && start
 		exit $?
 		;;
 	stop)
 		verify_all && stop
 		exit $?
 		;;
 	status|monitor)
 		verify_all
 		status
 		exit $?
 		;;
 	restart)
 		verify_all
 		stop
 		start
 		exit $?
 		;;
 	*)
 		echo "Usage: $0 {start|stop|status|monitor|restart|meta-data|validate-all}"
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac