diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-10 10:36:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-10 10:36:51 +0300 |
| commit | 2a955c7a834aca8ae966a2922cd289bf2f9d67d9 (patch) | |
| tree | ab2d03766f65b2dffe4d1ac043395548f108f5ef /sql/item_strfunc.cc | |
| parent | 5646c4315918c1e4127bfb68b70d1c5333bfc2c7 (diff) | |
| parent | 61b32df93119635570f42a96d0b99c7ea398430b (diff) | |
| download | mariadb-git-2a955c7a834aca8ae966a2922cd289bf2f9d67d9.tar.gz | |
Merge 10.3 into 10.4
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 d0727293c5f..6c82c580858 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++) { |