database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Don't give warning about usage of --language with full path

Browse Source 
Only give warning if warnings > 2, as there is no plan to change
the current behavior.
This commit is contained in:
Monty
2018-01-23 09:43:11 +02:00
parent f10fae7e4f
commit a1e0e64a47
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/derror.cc
View File

@@ -213,9 +213,12 @@ 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;
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("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."); 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)))
goto err; goto err;