diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
| commit | 65e8506ca9d03967191b6ed207cf107d311f7f99 (patch) | |
| tree | 3076ff798884b52655a5961be21e799708a4b628 /sql/mysqld.cc | |
| parent | 6adfce9c8d2a63a259dd0504600271498dcda228 (diff) | |
| parent | faddcf3c395da640b760c3f701f5bc1f3baae6c4 (diff) | |
| download | mariadb-git-mariadb-10.4.26.tar.gz | |
Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26
Diffstat (limited to 'sql/mysqld.cc')
| -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 9f03e4e819a..fa9a520a325 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4417,15 +4417,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) |