diff options
Diffstat (limited to 'databases/mysql51-server/files/patch-af')
| -rw-r--r-- | databases/mysql51-server/files/patch-af | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql51-server/files/patch-af +++ b/databases/mysql51-server/files/patch-af @@ -1,8 +1,8 @@ ---- 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 +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 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 -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - 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@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # 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 +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done |