Commit 9a8c1ee3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jwinstead2/mysql-4.1-7249 

into mysql.com:/home/jwinstead2/mysql-4.1-clean
parents 63abeac7 28478016

scripts/mysqld_safe.sh

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ parse_arguments() { 


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 \

if test -f ./share/mysql/english/errmsg.sys -a \

 -x ./bin/mysqld

then

  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
@@ -97,7 +97,7 @@ then 
    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"

  fi

# Check if this is a 'moved install directory'

elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \

elif test -f ./share/mysql/english/errmsg.sys -a \

 -x ./libexec/mysqld

then

  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are