Merge tag 'mariadb-5.5.54' into 5.5-galera

This commit is contained in:
Nirbhay Choubey 2016-12-27 21:39:05 -05:00
commit 901f7ebcf3
127 changed files with 1996 additions and 581 deletions

View file

@ -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