Commit f37a56de authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-21586 Server does not start if lc_messages setting was not english.

Fixed a bug introduced in  MDEV-11345, server did not start if
non-english error messages were set in startup parameters.

Added lc_messages=de_DE option into an existing test case.
parent 07e34cdd
...@@ -51,7 +51,7 @@ DROP TABLE t1; ...@@ -51,7 +51,7 @@ DROP TABLE t1;
# #
SET lc_messages=sr_YU; SET lc_messages=sr_YU;
Warnings: Warnings:
Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead Warning 1287 'sr_YU' ist veraltet. Bitte benutzen Sie 'sr_RS'
SHOW VARIABLES LIKE 'lc_messages'; SHOW VARIABLES LIKE 'lc_messages';
Variable_name Value Variable_name Value
lc_messages sr_RS lc_messages sr_RS
......
--lc-messages=de_DE
...@@ -84,8 +84,9 @@ bool init_errmessage(void) ...@@ -84,8 +84,9 @@ bool init_errmessage(void)
if (!use_english) if (!use_english)
{ {
/* Read messages from file. */ /* Read messages from file. */
use_english= !read_texts(ERRMSG_FILE,lang, &original_error_messages); error= use_english= read_texts(ERRMSG_FILE,lang, &original_error_messages);
error= TRUE; if(error)
sql_print_error("Could not load error messages for %s",lang);
} }
if (use_english) if (use_english)
......
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