diff options
| author | Monty <monty@mariadb.org> | 2018-01-23 09:43:11 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:57 +0200 |
| commit | a1e0e64a47f39ab3f05a24a19386f0d1e45e60e7 (patch) | |
| tree | 78fff41c76c41baf0ddafcb90131c1fc1100fe00 /sql/derror.cc | |
| parent | f10fae7e4fc71fccb488f6420f02b0be57bf5e8c (diff) | |
| download | mariadb-git-a1e0e64a47f39ab3f05a24a19386f0d1e45e60e7.tar.gz | |
Don't give warning about usage of --language with full path
Only give warning if warnings > 2, as there is no plan to change
the current behavior.
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 8be1c26b7e4..8011f8c4020 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -213,8 +213,11 @@ static File open_error_msg_file(const char *file_name, const char *language, O_RDONLY | O_SHARE | O_BINARY, MYF(0))) < 0) goto err; - sql_print_warning("An old style --language or -lc-message-dir value with language specific part detected: %s", lc_messages_dir); - sql_print_warning("Use --lc-messages-dir without language specific part instead."); + if (global_system_variables.log_warnings > 2) + { + sql_print_warning("An old style --language or -lc-message-dir value with language specific part detected: %s", lc_messages_dir); + sql_print_warning("Use --lc-messages-dir without language specific part instead."); + } } error_pos=1; if (mysql_file_read(file, (uchar*) head, 32, MYF(MY_NABP))) |