diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-08-04 21:24:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-08-10 08:54:22 +0200 |
| commit | 9d4ed44cac1c3a0bed1cda68a6113d1be92b97fe (patch) | |
| tree | 1b6785c0d6776763f4c341b419ef8b735d5b0449 | |
| parent | 50a2a8bb43b3248763f19cc4624ad37cff068f1d (diff) | |
| download | mariadb-git-9d4ed44cac1c3a0bed1cda68a6113d1be92b97fe.tar.gz | |
remove invalid options from warning messages
--log-slow-queries was removed in 10.0. Now opt_slow_logname
can be set either with --slow-query-log-file or with --log-basename
--log was removed in 10.0. Now opt_logname
can be set either with --general-log-file or with --log-basename
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 522dcf06ac2..6e68876537f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4748,15 +4748,15 @@ static int init_common_variables() /* check log options and issue warnings if needed */ if (opt_log && opt_logname && *opt_logname && !(log_output_options & (LOG_FILE | LOG_NONE))) - sql_print_warning("Although a path was specified for the " - "--log option, log tables are used. " + sql_print_warning("Although a general log file was specified, " + "log tables are used. " "To enable logging to files use the --log-output option."); if (global_system_variables.sql_log_slow && opt_slow_logname && *opt_slow_logname && !(log_output_options & (LOG_FILE | LOG_NONE))) - sql_print_warning("Although a path was specified for the " - "--log-slow-queries option, log tables are used. " + sql_print_warning("Although a slow query log file was specified, " + "log tables are used. " "To enable logging to files use the --log-output=file option."); if (!opt_logname || !*opt_logname) |