diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
| commit | f84e28c119b495da77e197f7cd18af4048fc3126 (patch) | |
| tree | 5957008a7725e23cc6331b1251ff5d3f6b725076 /sql/field.cc | |
| parent | ac2857a5fbf851d90171ac55f23385869ee6ba83 (diff) | |
| parent | e4901d9523ab838ea13bb0278980f8707aa2c581 (diff) | |
| download | mariadb-git-f84e28c119b495da77e197f7cd18af4048fc3126.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index b391234b866..8b82077f452 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2008, 2020, MariaDB + Copyright (c) 2008, 2021, 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 @@ -8556,6 +8556,7 @@ int Field_blob::store(const char *from,size_t length,CHARSET_INFO *cs) rc= well_formed_copy_with_check((char*) value.ptr(), (uint) new_length, cs, from, length, length, true, ©_len); + value.length(copy_len); Field_blob::store_length(copy_len); bmove(ptr+packlength,(uchar*) &tmp,sizeof(char*)); |