diff options
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 932c01b9dda..8b44d1bff9b 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -21,7 +21,7 @@ Read language depeneded messagefile */ -#include <my_global.h> +#include "mariadb.h" #include "sql_priv.h" #include "unireg.h" #include "derror.h" @@ -246,8 +246,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))) @@ -262,7 +265,8 @@ static File open_error_msg_file(const char *file_name, const char *language, ret->errors= uint2korr(head+12); ret->sections= uint2korr(head+14); - if (ret->max_error < error_messages || ret->sections != MAX_ERROR_RANGES) + if (unlikely(ret->max_error < error_messages || + ret->sections != MAX_ERROR_RANGES)) { sql_print_error("\ Error message file '%s' had only %d error messages, but it should contain at least %d error messages.\nCheck that the above file is the right version for this program!", @@ -306,8 +310,8 @@ bool read_texts(const char *file_name, const char *language, struct st_msg_file msg_file; DBUG_ENTER("read_texts"); - if ((file= open_error_msg_file(file_name, language, error_messages, - &msg_file)) == FERR) + if (unlikely((file= open_error_msg_file(file_name, language, error_messages, + &msg_file)) == FERR)) DBUG_RETURN(1); if (!(*data= (const char***) |