Commit 9d4ed44c authored by Sergei Golubchik's avatar Sergei Golubchik

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
parent 50a2a8bb
...@@ -4748,15 +4748,15 @@ static int init_common_variables() ...@@ -4748,15 +4748,15 @@ static int init_common_variables()
/* check log options and issue warnings if needed */ /* check log options and issue warnings if needed */
if (opt_log && opt_logname && *opt_logname && if (opt_log && opt_logname && *opt_logname &&
!(log_output_options & (LOG_FILE | LOG_NONE))) !(log_output_options & (LOG_FILE | LOG_NONE)))
sql_print_warning("Although a path was specified for the " sql_print_warning("Although a general log file was specified, "
"--log option, log tables are used. " "log tables are used. "
"To enable logging to files use the --log-output option."); "To enable logging to files use the --log-output option.");
if (global_system_variables.sql_log_slow && opt_slow_logname && if (global_system_variables.sql_log_slow && opt_slow_logname &&
*opt_slow_logname && *opt_slow_logname &&
!(log_output_options & (LOG_FILE | LOG_NONE))) !(log_output_options & (LOG_FILE | LOG_NONE)))
sql_print_warning("Although a path was specified for the " sql_print_warning("Although a slow query log file was specified, "
"--log-slow-queries option, log tables are used. " "log tables are used. "
"To enable logging to files use the --log-output=file option."); "To enable logging to files use the --log-output=file option.");
if (!opt_logname || !*opt_logname) if (!opt_logname || !*opt_logname)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment