diff options
| author | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
|---|---|---|
| committer | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
| commit | e9aed131ead9e102c8948ebadc421960399722d4 (patch) | |
| tree | ae8f4ee4ee7f7e915121ff2c73c88c20781c45ed /support-files | |
| parent | e4978d26b79120c58706e57fc66e4de1ec4b230c (diff) | |
| parent | ae1b3d1991b679bb38095711de27934d7683deda (diff) | |
| download | mariadb-git-e9aed131ead9e102c8948ebadc421960399722d4.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 5e1ad5bfd99..e3a52926b52 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -151,15 +151,9 @@ parse_server_arguments() { # Get arguments from the my.cnf file, # the only group, which is read from now on is [mysqld] -if test -x ./bin/my_print_defaults -then - print_defaults="./bin/my_print_defaults" -elif test -x $bindir/my_print_defaults +if test -x $bindir/my_print_defaults then print_defaults="$bindir/my_print_defaults" -elif test -x $bindir/mysql_print_defaults -then - print_defaults="$bindir/mysql_print_defaults" else # Try to find basedir in /etc/my.cnf conf=/etc/my.cnf |