Commit 37ee1b8e authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Move the pid file testing after arguments are parsed (previous patch was not correct)

parent 1130e4f8
No related merge requests found
......@@ -108,19 +108,6 @@ else
test -z "$print_defaults" && print_defaults="my_print_defaults"
fi
#
# Set pid file if not given
#
if test -z "$pid_file"
then
pid_file=$datadir/`@HOSTNAME@`.pid
else
case "$pid_file" in
/* ) ;;
* ) pid_file="$datadir/$pid_file" ;;
esac
fi
#
# Test if someone changed datadir; In this case we should also read the
# default arguments from this directory
......@@ -134,6 +121,19 @@ fi
parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
#
# Set pid file if not given
#
if test -z "$pid_file"
then
pid_file=$datadir/`@HOSTNAME@`.pid
else
case "$pid_file" in
/* ) ;;
* ) pid_file="$datadir/$pid_file" ;;
esac
fi
# Safeguard (relative paths, core dumps..)
cd $basedir
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment