bk commit into 5.0 tree (mtaylor:1.2406) BUG#27367

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor 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@stripped, 2007-03-21 21:21:32-07:00, mtaylor@qualinost.(none) +1 -0
  BUG#27367 mysql.server should be LSB init script compliant

  support-files/mysql.server.sh@stripped, 2007-03-21 21:21:30-07:00, mtaylor@qualinost.(none) +11 -2
    BUG#27367 Replaced [] with test syntax. Added test for locks on RedHat/SuSE systems

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.0-initstatus

--- 1.55/support-files/mysql.server.sh	2007-03-21 21:21:37 -07:00
+++ 1.56/support-files/mysql.server.sh	2007-03-21 21:21:37 -07:00
@@ -371,7 +371,7 @@
     ;;
   'status')
     # First, check to see if pid file exists
-    if [ -s "$server_pid_file" ] ; then 
+    if test -s "$server_pid_file" ; then 
       read mysqld_pid < $server_pid_file
       if kill -0 $mysqld_pid 2>/dev/null ; then 
         log_success_msg "MySQL running ($mysqld_pid)"
@@ -383,7 +383,16 @@
     else
       # Try to find appropriate mysqld process
       mysqld_pid=`pidof $sbindir/mysqld`
-      if [ -z $mysqld_pid ] ; then 
+      if test -z $mysqld_pid ; then 
+        if test "$use_mysqld_safe" = "0" ; then 
+          lockfile=/var/lock/subsys/mysqlmanager
+        else
+          lockfile=/var/lock/subsys/mysql
+        fi 
+        if test -f $lockfile ; then 
+          log_failure_msg "MySQL is not running, but lock exists"
+          exit 2
+        fi 
         log_failure_msg "MySQL is not running"
         exit 3
       else