#At file:///home/cmiller/work/mysqlbzr/mysql-5.1-bugteam--bug30261/ based on revid:kgeorge@stripped
2725 Chad MILLER 2009-01-20
Bug#30261: "mysqld --help" no longer possible for root
The check for root-ness would signal an error. Errors would make the
server exit before usage (help) information was printed.
Now, test for whether we want help regardless of whether we're going
to exit with an error.
modified:
sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2008-11-28 15:27:12 +0000
+++ b/sql/mysqld.cc 2009-01-20 16:09:14 +0000
@@ -1176,10 +1176,10 @@ extern "C" void unireg_abort(int exit_co
{
DBUG_ENTER("unireg_abort");
+ if (opt_help) {
+ usage();
if (exit_code)
sql_print_error("Aborting\n");
- else if (opt_help)
- usage();
clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */
DBUG_PRINT("quit",("done with cleanup in unireg_abort"));
wait_for_signal_thread_to_end();
@@ -7378,7 +7378,8 @@ static void usage(void)
default_collation_name= (char*) default_charset_info->name;
print_version();
puts("\
-Copyright (C) 2000 MySQL AB, by Monty and others\n\
+Copyright (C) 2000-2008 MySQL AB, by Monty and others\n\
+Copyright (C) 2008 Sun Microsystems, Inc.\n\
This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
and you are welcome to modify and redistribute it under the GPL license\n\n\
Starts the MySQL database server\n");
