diff options
| author | monty@mashka.mysql.fi <> | 2003-04-28 12:00:04 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-04-28 12:00:04 +0300 |
| commit | 938933afc9f90a5102dba643be1a3c54e6051ba6 (patch) | |
| tree | ad4ad251109e1f74cf4352b948ed961d8a6165b6 /support-files | |
| parent | dea3a3a88eec18749f36d8c52f6ad341bd564da8 (diff) | |
| download | mariadb-git-938933afc9f90a5102dba643be1a3c54e6051ba6.tar.gz | |
Use my.cnf file from datadir even if datadir is different from the default one.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 1e328a4f625..de01142beac 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -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 |