diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 11:33:07 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 11:33:07 +0200 |
commit | 256994ef7469fc4c62d5b271a6557ad729380f0e (patch) | |
tree | cafe54c729ef435f4d9ccbffa00502525b6c1ccf /sql | |
parent | 2daf3b14fe2aa9f0f126420beffcc8cb12b87d5e (diff) | |
download | mariadb-git-256994ef7469fc4c62d5b271a6557ad729380f0e.tar.gz |
MDEV-21586: Fix a warning for converting my_bool to bool
Diffstat (limited to 'sql')
-rw-r--r-- | sql/derror.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 31634383d1c..d6ca47e9054 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,9 @@ bool init_errmessage(void) if (!use_english) { /* Read messages from file. */ - error= use_english= read_texts(ERRMSG_FILE,lang, &original_error_messages); - if(error) + 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); } |