diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-03 18:15:54 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-04 09:10:55 +0000 |
| commit | ba824b66c1132f1360a317eeb8b590b705f04b69 (patch) | |
| tree | 8dc77562be85a40126df914a1b3f96f2402ff05a | |
| parent | ce8ee7d90b4f7dd784e1d7587093e671b35303f0 (diff) | |
| download | mariadb-git-ba824b66c1132f1360a317eeb8b590b705f04b69.tar.gz | |
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")
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6108ed6ffd4..68c8f6aa781 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9439,14 +9439,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) between options, setting of multiple variables, etc. 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 > global_system_variables.max_allowed_packet) { |