database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

cleanup: mtr startup warning

Browse Source 
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

1. s/--log_slow_queries/--log-slow-queries/
2. disable log-slow-admin-statement/etc in mytr when doing mysqld --help
This commit is contained in:
Sergei Golubchik
2017-02-14 15:30:45 +01:00
parent 6f6d0531dc
commit 41f42dff06
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/mysql-test-run.pl
View File

@@ -1833,6 +1833,9 @@ sub collect_mysqld_features {
mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); mtr_add_arg($args, "--lc-messages-dir=%s", $path_language);
mtr_add_arg($args, "--skip-grant-tables"); mtr_add_arg($args, "--skip-grant-tables");
mtr_add_arg($args, "--log-warnings=0"); mtr_add_arg($args, "--log-warnings=0");
mtr_add_arg($args, "--log-slow-admin-statements=0");
mtr_add_arg($args, "--log-queries-not-using-indexes=0");
mtr_add_arg($args, "--log-slow-slave-statements=0");
mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--verbose");
mtr_add_arg($args, "--help"); mtr_add_arg($args, "--help");

2
sql/mysqld.cc
View File

@@ -9480,7 +9480,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
sql_print_information("options --log-slow-admin-statements, " sql_print_information("options --log-slow-admin-statements, "
"--log-queries-not-using-indexes and " "--log-queries-not-using-indexes and "
"--log-slow-slave-statements have no " "--log-slow-slave-statements have no "
"effect if --log_slow_queries is not set"); "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)
{ {