diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-01-30 18:42:51 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-01-30 18:43:50 +0100 |
| commit | f37a56de3cb795883f5a799f6de9fc475d5feaae (patch) | |
| tree | 98f493ec9205e5f61c03ed37a56f040e62ee658a | |
| parent | 07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e (diff) | |
| download | mariadb-git-f37a56de3cb795883f5a799f6de9fc475d5feaae.tar.gz | |
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.
| -rw-r--r-- | mysql-test/r/locale.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/locale.opt | 1 | ||||
| -rw-r--r-- | sql/derror.cc | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/locale.result b/mysql-test/r/locale.result index a02e80ed21e..b08913fa390 100644 --- a/mysql-test/r/locale.result +++ b/mysql-test/r/locale.result @@ -51,7 +51,7 @@ DROP TABLE t1; # SET lc_messages=sr_YU; 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'; Variable_name Value lc_messages sr_RS diff --git a/mysql-test/t/locale.opt b/mysql-test/t/locale.opt new file mode 100644 index 00000000000..0ea17c2e0a8 --- /dev/null +++ b/mysql-test/t/locale.opt @@ -0,0 +1 @@ +--lc-messages=de_DE diff --git a/sql/derror.cc b/sql/derror.cc index 318800ea262..31634383d1c 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -84,8 +84,9 @@ bool init_errmessage(void) if (!use_english) { /* Read messages from file. */ - use_english= !read_texts(ERRMSG_FILE,lang, &original_error_messages); - error= TRUE; + error= use_english= read_texts(ERRMSG_FILE,lang, &original_error_messages); + if(error) + sql_print_error("Could not load error messages for %s",lang); } if (use_english) |