diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-14 15:30:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-14 20:43:41 +0100 |
| commit | 41f42dff0624f19baf2353f3c09b3040e53f929d (patch) | |
| tree | 30bd82a79050b6902efc4769078af83b4d4e49b3 | |
| parent | 6f6d0531dca711f13842cfca761afd073c595f57 (diff) | |
| download | mariadb-git-41f42dff0624f19baf2353f3c09b3040e53f929d.tar.gz | |
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
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b2c98692a22..9ce3c2ed8a9 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1833,6 +1833,9 @@ sub collect_mysqld_features { mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); mtr_add_arg($args, "--skip-grant-tables"); 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, "--help"); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e4a1a54749b..57292603b2d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9480,7 +9480,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr) 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"); + "effect if --log-slow-queries is not set"); if (global_system_variables.net_buffer_length > global_system_variables.max_allowed_packet) { |