summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 16:48:37 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 16:48:37 +0200
commit9e840d6898fb3739b441597b9da52c6eba8fe323 (patch)
tree73882a74ff5dc6ff56465d7d438479f10939bb4b /sql/sql_string.cc
parent03357ded174c13d941abc37e8c12506d75aaa52d (diff)
downloadmariadb-git-bb-10.5-MDEV-22387.tar.gz
WIP MDEV-22387bb-10.5-MDEV-22387
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 94f2e6fc8c6..d1998e6d420 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -237,8 +237,8 @@ bool Binary_string::copy(const Binary_string &str)
{
if (alloc(str.str_length))
return TRUE;
- str_length=str.str_length;
- bmove(Ptr,str.Ptr,str_length); // May be overlapping
+ if ((str_length=str.str_length))
+ bmove(Ptr,str.Ptr,str_length); // May be overlapping
Ptr[str_length]=0;
return FALSE;
}