diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:12:32 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:12:32 +0200 |
| commit | 65a963f755b1393bfbc82c7b71b0164070250b19 (patch) | |
| tree | 82eba85dc09a2d70f35445e107a949c8f9489c8c /sql/mysqld.cc | |
| parent | fbfd44be3ca9dd22d6da543325b72907ab795fa8 (diff) | |
| parent | c442e1ae21edc1f63906ac6101f1e989b589846f (diff) | |
| download | mariadb-git-65a963f755b1393bfbc82c7b71b0164070250b19.tar.gz | |
Merge branch '10.6' into 10.7
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 42c570d4dd2..f9d42731b9c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4276,15 +4276,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) |