Hi, Chad!
On Jan 20, Chad MILLER wrote:
> #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
>
> === 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();
Heh, indeed.
Looks like this simple solution will do the trick.
Please add to the "Aborting" a warning that plugin options may be
missing from the help (even better - that plugin options *are* missing,
but you'll need to detect whether the error happened before or after
plugin initialization).
after that -
ok to push
Regards / Mit vielen Grüßen,
Sergei
--
__ ___ ___ ____ __
/ |/ /_ __/ __/ __ \/ / Sergei Golubchik <serg@stripped>
/ /|_/ / // /\ \/ /_/ / /__ Principal Software Engineer/Server Architect
/_/ /_/\_, /___/\___\_\___/ Sun Microsystems GmbH, HRB München 161028
<___/ Sonnenallee 1, 85551 Kirchheim-Heimstetten
Geschäftsführer: Thomas Schroeder, Wolfgang Engels, Dr. Roland Boemer
Vorsitzender des Aufsichtsrates: Martin Häring
