mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fix for 39326 and bugteam tree.

Browse source
This commit is contained in:
Chad MILLER 2009-03-18 15:16:48 -04:00
commit 5ac1f353e1
1 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
scripts/mysqld_safe.sh
View file

@ -18,7 +18,7 @@ niceness=0
logging=init logging=init
want_syslog=0 want_syslog=0
syslog_tag= syslog_tag=
user=@MYSQLD_USER@ user='@MYSQLD_USER@'
pid_file= pid_file=
err_log= err_log=
@ -64,9 +64,10 @@ my_which ()
{ {
save_ifs="${IFS-UNSET}" save_ifs="${IFS-UNSET}"
IFS=: IFS=:
ret=0
for file for file
do do
for dir in $PATH for dir in "$PATH"
do do
if [ -f "$dir/$file" ] if [ -f "$dir/$file" ]
then then
@ -74,15 +75,18 @@ my_which ()
continue 2 continue 2
fi fi
done done
return 1 # Failure, didn't find file in path
ret=1 #signal an error
break
done done
if [ "$save_ifs" = UNSET ] if [ "$save_ifs" = UNSET ]
then then
unset IFS unset IFS
else else
IFS="$save_ifs" IFS="$save_ifs"
fi fi
return 0 # Success return $ret # Success
} }
log_generic () { log_generic () {
@ -212,19 +216,30 @@ fi
MY_PWD=`pwd` MY_PWD=`pwd`
# Check for the directories we would expect from a binary release install # Check for the directories we would expect from a binary release install
if test -f "$relpkgdata"/english/errmsg.sys -a -x ./bin/mysqld if test -n "$MY_BASEDIR_VERSION" -a -d "$MY_BASEDIR_VERSION"
then then
MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are # BASEDIR is already overridden on command line. Do not re-set.
ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
# Use BASEDIR to discover le.
if test -x "$MY_BASEDIR_VERSION/libexec/mysqld"
then
ledir="$MY_BASEDIR_VERSION/libexec"
else
ledir="$MY_BASEDIR_VERSION/bin"
fi
elif test -f "$relpkgdata"/english/errmsg.sys -a -x "$MY_PWD/bin/mysqld"
then
MY_BASEDIR_VERSION="$MY_PWD" # Where bin, share and data are
ledir="$MY_PWD/bin" # Where mysqld is
# Check for the directories we would expect from a source install # Check for the directories we would expect from a source install
elif test -f "$relpkgdata"/english/errmsg.sys -a -x ./libexec/mysqld elif test -f "$relpkgdata"/english/errmsg.sys -a -x "$MY_PWD/libexec/mysqld"
then then
MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are MY_BASEDIR_VERSION="$MY_PWD" # Where libexec, share and var are
ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is ledir="$MY_PWD/libexec" # Where mysqld is
# Since we didn't find anything, used the compiled-in defaults # Since we didn't find anything, used the compiled-in defaults
else else
MY_BASEDIR_VERSION=@prefix@ MY_BASEDIR_VERSION='@prefix@'
ledir=@libexecdir@ ledir='@libexecdir@'
fi fi
@ -274,7 +289,10 @@ export MYSQL_HOME
# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
# and then merge with the command line arguments # and then merge with the command line arguments
if test -x ./bin/my_print_defaults if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults"
then
print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults"
elif test -x ./bin/my_print_defaults
then then
print_defaults="./bin/my_print_defaults" print_defaults="./bin/my_print_defaults"
elif test -x @bindir@/my_print_defaults elif test -x @bindir@/my_print_defaults
@ -399,7 +417,7 @@ then
MYSQLD=mysqld MYSQLD=mysqld
fi fi
if test ! -x $ledir/$MYSQLD if test ! -x "$ledir/$MYSQLD"
then then
log_error "The file $ledir/$MYSQLD log_error "The file $ledir/$MYSQLD
does not exist or is not executable. Please cd to the mysql installation does not exist or is not executable. Please cd to the mysql installation
@ -411,7 +429,7 @@ fi
if test -z "$pid_file" if test -z "$pid_file"
then then
pid_file=$DATADIR/`@HOSTNAME@`.pid pid_file="$DATADIR/`@HOSTNAME@`.pid"
else else
case "$pid_file" in case "$pid_file" in
/* ) ;; /* ) ;;