Commit 97dbb356 authored by Sergei Golubchik's avatar Sergei Golubchik

simplify usage of logger.set_handlers()

parent a4ac987c
...@@ -3458,21 +3458,14 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused))) ...@@ -3458,21 +3458,14 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
REFRESH_GRANT | REFRESH_GRANT |
REFRESH_THREADS | REFRESH_HOSTS), REFRESH_THREADS | REFRESH_HOSTS),
(TABLE_LIST*) 0, &not_used); // Flush logs (TABLE_LIST*) 0, &not_used); // Flush logs
}
/* reenable logs after the options were reloaded */ /* reenable logs after the options were reloaded */
if (log_output_options & LOG_NONE) ulonglong fixed_log_output_options=
{ log_output_options & LOG_NONE ? LOG_TABLE : log_output_options;
logger.set_handlers(LOG_FILE,
global_system_variables.sql_log_slow ? logger.set_handlers(LOG_FILE, global_system_variables.sql_log_slow
LOG_TABLE : LOG_NONE, ? fixed_log_output_options : LOG_NONE,
opt_log ? LOG_TABLE : LOG_NONE); opt_log ? fixed_log_output_options : LOG_NONE);
}
else
{
logger.set_handlers(LOG_FILE,
global_system_variables.sql_log_slow ?
log_output_options : LOG_NONE,
opt_log ? log_output_options : LOG_NONE);
} }
break; break;
#ifdef USE_ONE_SIGNAL_HAND #ifdef USE_ONE_SIGNAL_HAND
......
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