Commit f8edb92a authored by unknown's avatar unknown

Merge lgrimmer@work.mysql.com:/home/bk/mysql

into mysql.com:/space/my/mysql-3.23
parents 6c7320ca 9029b880
...@@ -79,7 +79,8 @@ parse_arguments() { ...@@ -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 ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment