Commit 938933af authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi

Use my.cnf file from datadir even if datadir is different from the default one.

parent dea3a3a8
......@@ -118,7 +118,18 @@ else
test -z "$print_defaults" && print_defaults="my_print_defaults"
fi
parse_arguments `$print_defaults mysqld mysql_server mysql.server`
#
# Test if someone changed datadir; In this case we should also read the
# default arguments from this directory
#
extra_args=""
if test "$datadir" != "@localstatedir@"
then
extra_args="-e $datadir/my.cnf"
fi
parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
# 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