mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Use my.cnf file from datadir even if datadir is different from the default one.
This commit is contained in:
parent
0d58c5bc7a
commit
546097b95f
1 changed files with 12 additions and 1 deletions
|
|
@ -118,7 +118,18 @@ else
|
||||||
test -z "$print_defaults" && print_defaults="my_print_defaults"
|
test -z "$print_defaults" && print_defaults="my_print_defaults"
|
||||||
fi
|
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..)
|
# Safeguard (relative paths, core dumps..)
|
||||||
cd $basedir
|
cd $basedir
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue