mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
- removed unused variable $defaults
- parse mysql.server section in my.cnf as well
This commit is contained in:
@@ -79,7 +79,8 @@ parse_arguments() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get arguments from the my.cnf file, groups [mysqld] and [mysql_server]
|
# Get arguments from the my.cnf file,
|
||||||
|
# groups [mysqld] [mysql_server] and [mysql.server]
|
||||||
if test -x ./bin/my_print_defaults
|
if test -x ./bin/my_print_defaults
|
||||||
then
|
then
|
||||||
print_defaults="./bin/my_print_defaults"
|
print_defaults="./bin/my_print_defaults"
|
||||||
@@ -117,7 +118,7 @@ else
|
|||||||
test -z "$print_defaults" && print_defaults="my_print_defaults"
|
test -z "$print_defaults" && print_defaults="my_print_defaults"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
parse_arguments `$print_defaults $defaults mysqld mysql_server`
|
parse_arguments `$print_defaults mysqld mysql_server mysql.server`
|
||||||
|
|
||||||
# Safeguard (relative paths, core dumps..)
|
# Safeguard (relative paths, core dumps..)
|
||||||
cd $basedir
|
cd $basedir
|
||||||
|
Reference in New Issue
Block a user