diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-05 03:52:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-05 03:52:53 +0200 |
| commit | 5fdd9f878f3b4690e3f6f0710e5930a81fcd368a (patch) | |
| tree | 2959d46dd791f0698cbce4b4f3827956753e60bd /support-files | |
| parent | 591b058518dcbc736398d64e8bfd1ac43099323e (diff) | |
| parent | 491415cd0365f544d9199e96db34f30e58bed6ba (diff) | |
| download | mariadb-git-5fdd9f878f3b4690e3f6f0710e5930a81fcd368a.tar.gz | |
Merge with 3.23
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
libmysql/password.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_static.c:
Auto merged
mysys/my_static.h:
Auto merged
mysys/my_tempnam.c:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
mysql-test/t/temp_table.test:
Added comment
sql/mysqld.cc:
Don't apply change from 3.23
sql/sql_show.cc:
Don't apply change from 3.23
sql/structs.h:
Don't apply change from 3.23
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 5 |
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 |