bk commit into 4.1 tree (petr:1.2166) BUG#9507

[Petr Chardin]

Below is the list of changes that have just been committed into a local
4.1 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2166 05/03/31 06:34:07 petr@stripped +1 -0
  Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
  wait_for_pid function is fixed to wait for pid removal in "stop"

  support-files/mysql.server.sh
    1.37 05/03/31 06:34:04 petr@stripped +15 -3
    wait_for_pid function corrected to work properly with start/stop

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-4.1

--- 1.36/support-files/mysql.server.sh	2005-03-30 20:38:50 +04:00
+++ 1.37/support-files/mysql.server.sh	2005-03-31 06:34:04 +04:00
@@ -90,7 +90,19 @@
   i=0
   while test $i -lt 35 ; do
     sleep 1
-    test -s $pid_file && i='' && break
+    if [ $1 = "created" ]
+    then
+        test -s $pid_file && i='' && break
+    else
+      if [ $1 = "removed" ]
+      then
+        if [ ! -s $pid_file ]
+        then
+          i='' && break
+        fi
+      fi
+    fi
+
     echo $echo_n ".$echo_c"
     i=`expr $i + 1`
   done
@@ -180,7 +192,7 @@
       # be overwritten at next upgrade.
       echo $echo_n "Starting MySQL"
       $bindir/mysqld_safe --datadir=$datadir --pid-file=$pid_file >/dev/null 2>&1 &
-      wait_for_pid
+      wait_for_pid created
       
       # Make lock for RedHat / SuSE
       if test -w /var/lock/subsys
@@ -201,7 +213,7 @@
       echo $echo_n "Shutting down MySQL"
       kill $mysqld_pid
       # mysqld should remove the pid_file when it exits, so wait for it.
-      wait_for_pid
+      wait_for_pid removed
 
       # delete lock for RedHat / SuSE
       if test -f /var/lock/subsys/mysql