--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
+++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
@@ -10,25 +10,9 @@
 # mysql.server works by first doing a cd to the base directory and from there
 # executing safe_mysqld
 
-# Check if we are starting this relative (for the binary release)
-if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./bin/mysqld
-then
-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
-# Check if this is a 'moved install directory'
-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./libexec/mysqld
-then
-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
-else
-  MY_BASEDIR_VERSION=@prefix@
-  DATADIR=@localstatedir@
-  ledir=@libexecdir@
-fi
+MY_BASEDIR_VERSION=@prefix@
+DATADIR=@localstatedir@
+ledir=@libexecdir@
 
 pidfile=$DATADIR/`@HOSTNAME@`.pid
 log=$DATADIR/`@HOSTNAME@`.log
@@ -93,33 +77,6 @@
   if test ! -f $pidfile			# This is removed if normal shutdown
   then
     break;
-  fi
-  if @IS_LINUX@
-  then
-    # Test if one proces was hanging.
-    # This is only a fix for Linux (running as base 3 mysqld processes)
-    # but should work for the rest of the servers.
-    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
-    # kill -9 is used or the proces won't react on the kill.
-    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
-    echo -e "\nNumber of processes running now: $numofproces" | tee -a $log
-    I=1
-    while test "$I" -le "$numofproces"
-    do 
-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
-	for T in $PROC
-	do
-	  break
-	done
-	#    echo "TEST $I - $T **"
-	if kill -9 $T
-	then
-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
-	else 
-	  break
-	fi
-	I=`expr $I + 1`
-    done
   fi
   echo "mysqld restarted on " `date` | tee -a $log
 done