diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 15:22:33 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 15:22:33 +0400 |
| commit | 4282ac48c6ffb2af8cbe67c8f5a6a07e3c492b98 (patch) | |
| tree | 9be848da2a4d5b8c50da738ab6d008e82574170b /sql/field_conv.cc | |
| parent | 30b2447f7d930b4f1a16f56f5213b2f54de9cf8c (diff) | |
| parent | 7529870c7e52fd5e0d1c6e58402f3898f28cdf41 (diff) | |
| download | mariadb-git-4282ac48c6ffb2af8cbe67c8f5a6a07e3c492b98.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 0f6c85f50e8..509c31dfa86 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -337,9 +337,7 @@ static void do_copy_next_number(Copy_field *copy) static void do_copy_blob(Copy_field *copy) { - ulong length=((Field_blob*) copy->from_field)->get_length(); - ((Field_blob*) copy->to_field)->store_length(length); - memcpy(copy->to_ptr, copy->from_ptr, sizeof(char*)); + ((Field_blob*) copy->to_field)->copy_value(((Field_blob*) copy->from_field)); } static void do_conv_blob(Copy_field *copy) @@ -714,12 +712,7 @@ Copy_field::get_copy_func(Field *to,Field *from) if (!(from->flags & BLOB_FLAG) || from->charset() != to->charset()) return do_conv_blob; if (from_length != to_length) - { - // Correct pointer to point at char pointer - to_ptr+= to_length - portable_sizeof_char_ptr; - from_ptr+= from_length - portable_sizeof_char_ptr; return do_copy_blob; - } } else { |