rpms/mysql/devel mysql.init,1.16,1.17 mysql.spec,1.61,1.62

[fedora-cvs-commits at redhat.com]

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16157

Modified Files:
	mysql.init mysql.spec 
Log Message:
Make stop script wait for daemon process to disappear (bz#172426)


Index: mysql.init
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mysql.init	12 Jan 2005 17:53:54 -0000	1.16
+++ mysql.init	14 Nov 2005 17:31:18 -0000	1.17
@@ -76,7 +76,7 @@
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=10
+	    STARTTIMEOUT=30
 	    while [ $STARTTIMEOUT -gt 0 ]; do
 		RESPONSE=`/usr/bin/mysqladmin -uUNKNOWN_MYSQL_USER ping 2>&1` && break
 		echo "$RESPONSE" | grep -q "Access denied for user" && break
@@ -97,17 +97,34 @@
 }
 
 stop(){
-        /bin/kill `cat "$mypidfile"  2>/dev/null ` >/dev/null 2>&1
-	ret=$?
-	if [ $ret -eq 0 ]; then
-	    sleep 2
-	    rm -f /var/lock/subsys/mysqld
-	    rm -f "$socketfile"
-	    action $"Stopping $prog: " /bin/true
-	else
-    	    action $"Stopping $prog: " /bin/false
-	fi
-	return $ret
+        MYSQLPID=`cat "$mypidfile"  2>/dev/null `
+        if [ -n "$MYSQLPID" ]; then
+            /bin/kill "$MYSQLPID" >/dev/null 2>&1
+            ret=$?
+            if [ $ret -eq 0 ]; then
+                STOPTIMEOUT=60
+                while [ $STOPTIMEOUT -gt 0 ]; do
+                    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
+                    sleep 1
+                    let STOPTIMEOUT=${STOPTIMEOUT}-1
+                done
+                if [ $STOPTIMEOUT -eq 0 ]; then
+                    echo "Timeout error occurred trying to stop MySQL Daemon."
+                    ret=1
+                    action $"Stopping $prog: " /bin/false
+                else
+                    rm -f /var/lock/subsys/mysqld
+                    rm -f "$socketfile"
+                    action $"Stopping $prog: " /bin/true
+                fi
+            else
+                action $"Stopping $prog: " /bin/false
+            fi
+        else
+            ret=1
+            action $"Stopping $prog: " /bin/false
+        fi
+        return $ret
 }
  
 restart(){


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mysql.spec	9 Nov 2005 21:02:25 -0000	1.61
+++ mysql.spec	14 Nov 2005 17:31:18 -0000	1.62
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.15
-Release: 2
+Release: 3
 Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source2: mysql.logrotate
@@ -355,6 +355,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Mon Nov 14 2005 Tom Lane <tgl at redhat.com> 5.0.15-3
+- Make stop script wait for daemon process to disappear (bz#172426)
+
 * Wed Nov  9 2005 Tom Lane <tgl at redhat.com> 5.0.15-2
 - Rebuild due to openssl library update.