Skip to content

Commit 41f42df

Browse files
committed
cleanup: mtr startup warning
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
1 parent 6f6d053 commit 41f42df

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,6 +1833,9 @@ sub collect_mysqld_features {
18331833
mtr_add_arg($args, "--lc-messages-dir=%s", $path_language);
18341834
mtr_add_arg($args, "--skip-grant-tables");
18351835
mtr_add_arg($args, "--log-warnings=0");
1836+
mtr_add_arg($args, "--log-slow-admin-statements=0");
1837+
mtr_add_arg($args, "--log-queries-not-using-indexes=0");
1838+
mtr_add_arg($args, "--log-slow-slave-statements=0");
18361839
mtr_add_arg($args, "--verbose");
18371840
mtr_add_arg($args, "--help");
18381841

sql/mysqld.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9480,7 +9480,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
94809480
sql_print_information("options --log-slow-admin-statements, "
94819481
"--log-queries-not-using-indexes and "
94829482
"--log-slow-slave-statements have no "
9483-
"effect if --log_slow_queries is not set");
9483+
"effect if --log-slow-queries is not set");
94849484
if (global_system_variables.net_buffer_length >
94859485
global_system_variables.max_allowed_packet)
94869486
{

0 commit comments

Comments
 (0)