summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-20 21:16:23 +0100
committerSergei Golubchik <serg@mariadb.org>2016-12-22 12:25:10 +0100
commit8fcdd6b0ecbb966f4479856efe93a963a7a422f7 (patch)
treefba4ed22bffb10e693f133aee67b180826bf38b9 /support-files
parentc8e49f2f57b7e8c9dcf3cdb108dc15e6b63b4dc4 (diff)
downloadmariadb-git-8fcdd6b0ecbb966f4479856efe93a963a7a422f7.tar.gz
Numerous issues in mysqld_safe
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index d4fff33af13..a4034dec385 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -157,15 +157,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