database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-03 07:02:23 +03:00
Code

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

Browse Source 
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")
This commit is contained in:
Vladislav Vaintroub 2017-05-03 18:15:54 +00:00
parent ce8ee7d90b
commit ba824b66c1
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysqld.cc
View File

@ -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)
{ {