diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2010-10-08 12:12:18 +0500 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2010-10-08 12:12:18 +0500 |
commit | 5f318d4ad9e9b279134564de8f350864c6254c3b (patch) | |
tree | 92b091568d6c984d8635e9046e60d2256e0cc244 | |
parent | 42dc7264c009fb8f32bce88b80f74bcaae6f63b4 (diff) | |
download | mariadb-git-5f318d4ad9e9b279134564de8f350864c6254c3b.tar.gz |
Bug#30025 Mysqld prints out warnings/errors being run with --no-defaults --help
now do no initializations for the --help.
Do it for --verbose --help though.
per-file comments:
sql/mysqld.cc
Bug#30025 Mysqld prints out warnings/errors being run with --no-defaults --help
quit with the help message at once as --help was given
-rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e43320f12a5..e489d466d5f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3202,6 +3202,11 @@ static int init_common_variables() return 1; set_server_version(); +#ifndef EMBEDDED_LIBRARY + if (opt_help && !opt_verbose) + unireg_abort(0); +#endif /*!EMBEDDED_LIBRARY*/ + DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, server_version, SYSTEM_TYPE,MACHINE_TYPE)); |