diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
| commit | 901f7ebcf3aa45c99f82e655a8482c50f10b840e (patch) | |
| tree | 091845fdaadfeb3dbafaca03acec1fdeeffefead /support-files | |
| parent | 5ddd8149e44122feb0989b9944113d2b92d6f84a (diff) | |
| parent | ec6d8dadc01269451332e5b24b12a5350a2a4896 (diff) | |
| download | mariadb-git-901f7ebcf3aa45c99f82e655a8482c50f10b840e.tar.gz | |
Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54
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 c00c06f28af..50094ac6142 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -166,15 +166,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 |