summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-05 03:52:53 +0200
committermonty@mashka.mysql.fi <>2002-12-05 03:52:53 +0200
commit2435dce96d5fbb4e6b34cc976f0301666a3793d2 (patch)
tree2959d46dd791f0698cbce4b4f3827956753e60bd /support-files/mysql.server.sh
parentfc06433a69113a914b58f5bb78b98b39f3dce4b8 (diff)
parent82a9669267e5e84e93104a739ce628bb0cd33d36 (diff)
downloadmariadb-git-2435dce96d5fbb4e6b34cc976f0301666a3793d2.tar.gz
Merge with 3.23
Diffstat (limited to 'support-files/mysql.server.sh')
-rw-r--r--support-files/mysql.server.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 822e864dd77..d52ade03836 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -79,7 +79,8 @@ parse_arguments() {
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
then
print_defaults="./bin/my_print_defaults"
@@ -117,7 +118,7 @@ else
test -z "$print_defaults" && print_defaults="my_print_defaults"
fi
-parse_arguments `$print_defaults $defaults mysqld mysql_server`
+parse_arguments `$print_defaults mysqld mysql_server mysql.server`
# Safeguard (relative paths, core dumps..)
cd $basedir