database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge from bug tree.

Browse Source
This commit is contained in:
Chad MILLER
2009-02-11 23:44:32 -05:00
parent 392c53b6c3 d880862549
commit b8149f09d6
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/mysqld.cc
View File

@ -688,6 +688,8 @@ bool mysqld_embedded=0;
bool mysqld_embedded=1; bool mysqld_embedded=1;
#endif #endif
static my_bool plugins_are_initialized= FALSE;
#ifndef DBUG_OFF #ifndef DBUG_OFF
static const char* default_dbug_option; static const char* default_dbug_option;
#endif #endif
@ -1172,10 +1174,10 @@ extern "C" void unireg_abort(int exit_code)
{ {
DBUG_ENTER("unireg_abort"); DBUG_ENTER("unireg_abort");
if (opt_help)
usage();
if (exit_code) if (exit_code)
sql_print_error("Aborting\n"); sql_print_error("Aborting\n");
else if (opt_help)
usage();
clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */ clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */
DBUG_PRINT("quit",("done with cleanup in unireg_abort")); DBUG_PRINT("quit",("done with cleanup in unireg_abort"));
wait_for_signal_thread_to_end(); wait_for_signal_thread_to_end();
@ -3843,12 +3845,15 @@ server.");
if (ha_init_errors()) if (ha_init_errors())
DBUG_RETURN(1); DBUG_RETURN(1);
if (plugin_init(&defaults_argc, defaults_argv, {
(opt_noacl ? PLUGIN_INIT_SKIP_PLUGIN_TABLE : 0) | if (plugin_init(&defaults_argc, defaults_argv,
(opt_help ? PLUGIN_INIT_SKIP_INITIALIZATION : 0))) (opt_noacl ? PLUGIN_INIT_SKIP_PLUGIN_TABLE : 0) |
{ (opt_help ? PLUGIN_INIT_SKIP_INITIALIZATION : 0)))
sql_print_error("Failed to initialize plugins."); {
unireg_abort(1); sql_print_error("Failed to initialize plugins.");
unireg_abort(1);
}
plugins_are_initialized= TRUE; /* Don't separate from init function */
} }
if (opt_help) if (opt_help)
@ -7423,7 +7428,8 @@ static void usage(void)
default_collation_name= (char*) default_charset_info->name; default_collation_name= (char*) default_charset_info->name;
print_version(); print_version();
puts("\ 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\ 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\ and you are welcome to modify and redistribute it under the GPL license\n\n\
Starts the MySQL database server\n"); Starts the MySQL database server\n");
@ -7453,6 +7459,13 @@ Starts the MySQL database server\n");
/* Print out all the options including plugin supplied options */ /* Print out all the options including plugin supplied options */
my_print_help_inc_plugins(my_long_options, sizeof(my_long_options)/sizeof(my_option)); my_print_help_inc_plugins(my_long_options, sizeof(my_long_options)/sizeof(my_option));
if (! plugins_are_initialized)
{
puts("\n\
Plugins have parameters that are not reflected in this list\n\
because execution stopped before plugins were initialized.");
}
puts("\n\ puts("\n\
To see what values a running MySQL server is using, type\n\ To see what values a running MySQL server is using, type\n\
'mysqladmin variables' instead of 'mysqld --verbose --help'."); 'mysqladmin variables' instead of 'mysqld --verbose --help'.");