Commit a1e0e64a authored by Monty's avatar Monty

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.
parent f10fae7e
...@@ -213,8 +213,11 @@ static File open_error_msg_file(const char *file_name, const char *language, ...@@ -213,8 +213,11 @@ static File open_error_msg_file(const char *file_name, const char *language,
O_RDONLY | O_SHARE | O_BINARY, O_RDONLY | O_SHARE | O_BINARY,
MYF(0))) < 0) MYF(0))) < 0)
goto err; goto err;
sql_print_warning("An old style --language or -lc-message-dir value with language specific part detected: %s", lc_messages_dir); if (global_system_variables.log_warnings > 2)
sql_print_warning("Use --lc-messages-dir without language specific part instead."); {
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; error_pos=1;
if (mysql_file_read(file, (uchar*) head, 32, MYF(MY_NABP))) if (mysql_file_read(file, (uchar*) head, 32, MYF(MY_NABP)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment