diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-04-28 01:27:54 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-04-28 01:27:54 +0200 |
| commit | b762965cb018d52481c2d83e4019a38a1a9050f7 (patch) | |
| tree | c71eb1aac5c6de4e25b3a83d40f51602663a98d1 /mysys/default.c | |
| parent | ecbbc45742c026bd16225aa53b956b97a0b1c22a (diff) | |
| download | mariadb-git-b762965cb018d52481c2d83e4019a38a1a9050f7.tar.gz | |
Bug #27390: mysqld_multi --config-file= not working as documented
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
extra/my_print_defaults.c:
Make help text more accurate regarding how --config-file, --defaults-file, and --defaults-extra-file should be used. Flag --config-file as deprecated.
mysys/default.c:
Always print a newline after listing the default files, even if
--defaults-file= was set (in my_print_default_files()).
scripts/mysqld_multi.sh:
Recognize --no-defaults, --defaults-file and --defaults-extra-file options.
Treat old --config-file argument as if --defaults-extra-file had been specified
instead.
Improve find_groups() method, to honor --defaults-file, etc.
A few random drive-by cleanups, while I'm here.
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index dc1c5a698b8..aff38b6af0b 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -877,8 +877,8 @@ void my_print_default_files(const char *conf_file) fputs(name,stdout); } } - puts(""); } + puts(""); } void print_defaults(const char *conf_file, const char **groups) |