summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e7638f13526..7fb9f5f8348 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6108,14 +6108,16 @@ mysql_getopt_value(const char *keyname, uint key_length,
return option->value;
}
-void option_error_reporter( enum loglevel level, const char *format, ... )
+
+void option_error_reporter(enum loglevel level, const char *format, ...)
{
va_list args;
- va_start( args, format );
- vprint_msg_to_log( level, format, args );
- va_end( args );
+ va_start(args, format);
+ vprint_msg_to_log(level, format, args);
+ va_end(args);
}
+
static void get_options(int argc,char **argv)
{
int ho_error;
@@ -6123,7 +6125,9 @@ static void get_options(int argc,char **argv)
my_getopt_register_get_addr(mysql_getopt_value);
strmake(def_ft_boolean_syntax, ft_boolean_syntax,
sizeof(ft_boolean_syntax)-1);
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, option_error_reporter)))
+ my_getopt_error_reporter= option_error_reporter;
+ if ((ho_error= handle_options(&argc, &argv, my_long_options,
+ get_one_option)))
exit(ho_error);
if (argc > 0)
{