From a3983787764d82e312e28f6f65fa86750e491fec Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@mysql.com>
Date: Fri, 8 Oct 2010 12:12:18 +0500
Subject: [PATCH] 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
---
 sql/mysqld.cc | 5 +++++
 1 file changed, 5 insertions(+)

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));