diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 14:19:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 14:19:15 +0200 |
| commit | 1c192843f2619f528aaf334d0346cf14976b3845 (patch) | |
| tree | 76570a260ad1ffe19508b89cdfe0a70c4c86f59e /sql/mysqld.cc | |
| parent | 47d5cfc650688a0748d40df53a4752fa2892c303 (diff) | |
| parent | 10ed52767d25f3f9b9f5eee4983a3dee612ed2c6 (diff) | |
| download | mariadb-git-1c192843f2619f528aaf334d0346cf14976b3845.tar.gz | |
Merge branch '10.9' into 10.10
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 26bded896cc..0d365166bc8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4284,15 +4284,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) |