diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 13:16:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 14:33:24 +0200 |
| commit | 587568b72a0f4bcb284b292f158dea6f65c03487 (patch) | |
| tree | e9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /mysys/my_default.c | |
| parent | bcb36ee21e2515d17dcf03b760487e64eb780f2b (diff) | |
| parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
| download | mariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index 5d9e4ffac88..addab75bff8 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -1102,10 +1102,12 @@ void print_defaults(const char *conf_file, const char **groups) } } puts("\nThe following options may be given as the first argument:\n\ ---print-defaults Print the program argument list and exit.\n\ ---no-defaults Don't read default options from any option file.\n\ ---defaults-file=# Only read default options from the given file #.\n\ ---defaults-extra-file=# Read this file after the global files are read."); +--print-defaults Print the program argument list and exit.\n\ +--no-defaults Don't read default options from any option file.\n\ +The following specify which files/extra groups are read (specified before remaining options):\n\ +--defaults-file=# Only read default options from the given file #.\n\ +--defaults-extra-file=# Read this file after the global files are read.\n\ +--defaults-group-suffix=# Additionally read default groups with # appended as a suffix."); } |