74 lines
2.3 KiB
Plaintext
74 lines
2.3 KiB
Plaintext
--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998
|
|
+++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998
|
|
@@ -12,33 +12,9 @@
|
|
|
|
trap '' 1 2 3 15 # we shouldn't let anyone kill us
|
|
|
|
-# Check if we are starting this relative (for the binary release)
|
|
-if test -d ./data/mysql -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@
|
|
- if test ! -x $ledir/mysqld
|
|
- then
|
|
- echo "The file $ledir/mysqld doesn't exists or is not executable"
|
|
- echo "Please do a cd to the mysql installation directory and restart"
|
|
- echo "this scrift from there as follows:"
|
|
- echo "./bin/safe_mysqld".
|
|
- exit 1;
|
|
- fi
|
|
-fi
|
|
+MY_BASEDIR_VERSION=@prefix@
|
|
+DATADIR=@localstatedir@
|
|
+ledir=@libexecdir@
|
|
|
|
pid_file=$DATADIR/`@HOSTNAME@`.pid
|
|
log=$DATADIR/`@HOSTNAME@`.log
|
|
@@ -114,33 +90,6 @@
|
|
if test ! -f $pid_file # 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 $err_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 $err_log
|
|
- else
|
|
- break
|
|
- fi
|
|
- I=`expr $I + 1`
|
|
- done
|
|
fi
|
|
echo "mysqld restarted on " `date` | tee -a $err_log
|
|
done
|