Commit 0745db71 authored by Sergei Golubchik's avatar Sergei Golubchik

don't use buffered_option_error_reporter without perfschema

it's not printed, not cleaned up without perfschema,
so isn't supposed to be written into either

this fixes "Memory not freed" warnings when early command line
options produce warnings in non-perfschema builds
parent eafa2a14
...@@ -1392,12 +1392,13 @@ static MYSQL_SOCKET unix_sock, base_ip_sock, extra_ip_sock; ...@@ -1392,12 +1392,13 @@ static MYSQL_SOCKET unix_sock, base_ip_sock, extra_ip_sock;
struct my_rnd_struct sql_rand; ///< used by sql_class.cc:THD::THD() struct my_rnd_struct sql_rand; ///< used by sql_class.cc:THD::THD()
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
C_MODE_START
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
/** /**
Error reporter that buffer log messages. Error reporter that buffer log messages.
@param level log message level @param level log message level
@param format log message format string @param format log message format string
*/ */
C_MODE_START
static void buffered_option_error_reporter(enum loglevel level, static void buffered_option_error_reporter(enum loglevel level,
const char *format, ...) const char *format, ...)
{ {
...@@ -1409,6 +1410,7 @@ static void buffered_option_error_reporter(enum loglevel level, ...@@ -1409,6 +1410,7 @@ static void buffered_option_error_reporter(enum loglevel level,
va_end(args); va_end(args);
buffered_logs.buffer(level, buffer); buffered_logs.buffer(level, buffer);
} }
#endif
/** /**
...@@ -5809,7 +5811,7 @@ int mysqld_main(int argc, char **argv) ...@@ -5809,7 +5811,7 @@ int mysqld_main(int argc, char **argv)
Initialize the array of performance schema instrument configurations. Initialize the array of performance schema instrument configurations.
*/ */
init_pfs_instrument_array(); init_pfs_instrument_array();
#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
/* /*
Logs generated while parsing the command line Logs generated while parsing the command line
options are buffered and printed later. options are buffered and printed later.
...@@ -5817,7 +5819,7 @@ int mysqld_main(int argc, char **argv) ...@@ -5817,7 +5819,7 @@ int mysqld_main(int argc, char **argv)
buffered_logs.init(); buffered_logs.init();
my_getopt_error_reporter= buffered_option_error_reporter; my_getopt_error_reporter= buffered_option_error_reporter;
my_charset_error_reporter= buffered_option_error_reporter; my_charset_error_reporter= buffered_option_error_reporter;
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
pfs_param.m_pfs_instrument= const_cast<char*>(""); pfs_param.m_pfs_instrument= const_cast<char*>("");
#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */ #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
my_timer_init(&sys_timer_info); my_timer_init(&sys_timer_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment