diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 11:37:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 11:37:12 +0200 |
| commit | 5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea (patch) | |
| tree | b33d1e67c5a03abd85abe023f078d0201b12adeb /sql/derror.cc | |
| parent | dbbe9961a53cad97544499c3187771df64f25b18 (diff) | |
| parent | 256994ef7469fc4c62d5b271a6557ad729380f0e (diff) | |
| download | mariadb-git-5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 14b60ee4db4..7a79833c26c 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (C) 2011 Monty Program Ab + Copyright (C) 2011, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -84,8 +84,10 @@ bool init_errmessage(void) if (!use_english) { /* Read messages from file. */ - use_english= !read_texts(ERRMSG_FILE,lang, &original_error_messages); - error= TRUE; + use_english= read_texts(ERRMSG_FILE,lang, &original_error_messages); + error= use_english != FALSE; + if (error) + sql_print_error("Could not load error messages for %s",lang); } if (use_english) |