diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
| commit | ee8b5c305a2334d06fe999b2db441d0436f9f423 (patch) | |
| tree | fb613fed64234c3e211d2ae01272e1f31ca19138 /support-files/mysql.server.sh | |
| parent | 11544334a277508fb984c0a5bba8faa6b97a2762 (diff) | |
| parent | 4f5338467807f099b67f07d0bfb415358222a2b1 (diff) | |
| download | mariadb-git-ee8b5c305a2334d06fe999b2db441d0436f9f423.tar.gz | |
Merge tag 'mariadb-10.0.29' into 10.0-galera
Diffstat (limited to 'support-files/mysql.server.sh')
| -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 8d2e78edbd8..fc173e3993d 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -160,15 +160,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 |