diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
| commit | cf87f3e08c10dd7a944447ddee93fbc3827e6570 (patch) | |
| tree | 3c81320e2811d99e075f7d03d3bf0d1cdfa48c84 /sql/item_strfunc.cc | |
| parent | 1bf77cde5c62166c0f1652c2a1764e05ce76edb5 (diff) | |
| parent | 2f7b37b02154748b223e385a7d7787900ab37b5e (diff) | |
| download | mariadb-git-cf87f3e08c10dd7a944447ddee93fbc3827e6570.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 58f41ecfbbc..c2de296a109 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB Corporation + Copyright (c) 2009, 2020, MariaDB Corporation. 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 @@ -641,7 +641,7 @@ String *Item_func_concat_operator_oracle::val_str(String *str) { DBUG_ASSERT(fixed == 1); THD *thd= current_thd; - String *res; + String *res= NULL; uint i; null_value=0; @@ -651,7 +651,7 @@ String *Item_func_concat_operator_oracle::val_str(String *str) if ((res= args[i]->val_str(str))) break; } - if (i == arg_count) + if (!res) goto null; if (res != str) |