68 lines
2.0 KiB
Plaintext
68 lines
2.0 KiB
Plaintext
--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001
|
|
+++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001
|
|
@@ -64,26 +64,9 @@
|
|
done
|
|
}
|
|
|
|
-MY_PWD=`pwd`
|
|
-# Check if we are starting this relative (for the binary release)
|
|
-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
|
|
- -x ./bin/mysqld
|
|
-then
|
|
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
|
|
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
|
|
- DATADIR=$MY_BASEDIR_VERSION/data
|
|
-# 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=$MY_PWD # Where libexec, share and var are
|
|
- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
|
|
- DATADIR=$MY_BASEDIR_VERSION/var
|
|
-else
|
|
- MY_BASEDIR_VERSION=@prefix@
|
|
- DATADIR=@localstatedir@
|
|
- ledir=@libexecdir@
|
|
-fi
|
|
+MY_BASEDIR_VERSION=@prefix@
|
|
+DATADIR=@localstatedir@
|
|
+ledir=@libexecdir@
|
|
|
|
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
|
|
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
|
|
@@ -220,34 +203,6 @@
|
|
if test ! -f $pid_file # This is removed if normal shutdown
|
|
then
|
|
break
|
|
- fi
|
|
-
|
|
- if @IS_LINUX@
|
|
- then
|
|
- # Test if one process 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 process won't react on the kill.
|
|
- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
|
|
- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
|
|
- I=1
|
|
- while test "$I" -le "$numofproces"
|
|
- do
|
|
- PROC=`ps xa | 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 process hanging, pid $T - killed" | tee -a $err_log
|
|
- else
|
|
- break
|
|
- fi
|
|
- I=`expr $I + 1`
|
|
- done
|
|
fi
|
|
|
|
echo "`date +'%y%m%d %H:%M:%S mysqld restarted'`" | tee -a $err_log
|