diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-24 16:52:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-24 16:52:27 +0300 |
| commit | 04b8cb1882d895931380f2671fe942852e62bc24 (patch) | |
| tree | 46d0af1ca06ba43198a4cde04fa6f0a3937b0118 /mysys | |
| parent | bca31a686ded83db136be66efe36eab022ebf882 (diff) | |
| parent | b416a553769cabf9b99232df39244c4f4a9f48c6 (diff) | |
| download | mariadb-git-04b8cb1882d895931380f2671fe942852e62bc24.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- client/mysql.cc
- client/mysqldump.c
- configure.in
- mysql-test/r/csv.result
- mysql-test/r/func_time.result
- mysql-test/r/show_check.result
- mysql-test/r/sp-error.result
- mysql-test/r/sp.result
- mysql-test/r/sp_trans.result
- mysql-test/r/type_blob.result
- mysql-test/r/type_timestamp.result
- mysql-test/r/warnings.result
- mysql-test/suite/rpl/r/rpl_sp.result
- sql/mysql_priv.h
- sql/mysqld.cc
- sql/sp.cc
- sql/sql_base.cc
- sql/sql_table.cc
- sql/sql_trigger.cc
- sql/sql_view.cc
- sql/table.h
- sql/share/errmsg.txt
- mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/default.c b/mysys/default.c index 4a0f1c6f009..fc119bb3283 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1028,10 +1028,10 @@ 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 options 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\ +--defaults-file=# Only read default options from the given file #.\n\ +--defaults-extra-file=# Read this file after the global files are read."); } #include <help_end.h> |