diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
| commit | 43ee6915fa4b8e3088e89b7d4325946190ce04f5 (patch) | |
| tree | e580d22b0ff6faed1720f88ddeedf86a0867fa41 /sql/item_strfunc.cc | |
| parent | 7d4beb7286d53be07ff552de9d37ea90c2762651 (diff) | |
| parent | 1ebe841fb85725c2a6aaecb3bca41ec098a5193d (diff) | |
| download | mariadb-git-43ee6915fa4b8e3088e89b7d4325946190ce04f5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 51723a25dee..fda7f59b128 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -603,7 +603,7 @@ String *Item_func_concat::val_str(String *str) goto null; if (res != str) - str->copy(res->ptr(), res->length(), res->charset()); + str->copy_or_move(res->ptr(), res->length(), res->charset()); for (uint i= 1 ; i < arg_count ; i++) { |