diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:36:20 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:36:20 +0200 |
| commit | 6ffbc0e510cdaafe0494acd04e48d1f44727e86a (patch) | |
| tree | 8d7b5774e82834d4ece6963f69b63d3b7994443f /sql/mysqld.cc | |
| parent | 73e086442a96442ae33be57efe8cca275ee9ba2c (diff) | |
| parent | 98d7ac1fbe2d61c0d21e2c22808ef808f29c0827 (diff) | |
| download | mariadb-git-6ffbc0e510cdaafe0494acd04e48d1f44727e86a.tar.gz | |
Merge branch '10.7' into 10.8mariadb-10.8.4
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 25b77a09db2..62790dfa218 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4281,15 +4281,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) |