Commit ba824b66 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-12597 Do not print warning about inconsistent slow-log variables

The new 10.2 has log-slow-admin-statements ON but log-slow-queries OFF,
thus  there is no reason for a warning about it(the change was "by design")
parent ce8ee7d9
...@@ -9439,14 +9439,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) ...@@ -9439,14 +9439,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
between options, setting of multiple variables, etc. between options, setting of multiple variables, etc.
Do them here. Do them here.
*/ */
if ((opt_log_slow_admin_statements || opt_log_queries_not_using_indexes ||
opt_log_slow_slave_statements) &&
!global_system_variables.sql_log_slow)
sql_print_information("options --log-slow-admin-statements, "
"--log-queries-not-using-indexes and "
"--log-slow-slave-statements have no "
"effect if --log-slow-queries is not set");
if (global_system_variables.net_buffer_length > if (global_system_variables.net_buffer_length >
global_system_variables.max_allowed_packet) global_system_variables.max_allowed_packet)
{ {
......
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