Merge remote-tracking branch '5.5' into 10.0

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 5006266eaed..ec3e6c3aaaf 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -590,7 +590,7 @@ void Copy_field::set(uchar *to,Field *from)
 {
   from_ptr=from->ptr;
   to_ptr=to;
-  from_length=from->pack_length();
+  from_length=from->pack_length_in_rec();
   if (from->maybe_null())
   {
     from_null_ptr=from->null_ptr;
@@ -641,9 +641,9 @@ void Copy_field::set(Field *to,Field *from,bool save)
   from_field=from;
   to_field=to;
   from_ptr=from->ptr;
-  from_length=from->pack_length();
+  from_length=from->pack_length_in_rec();
   to_ptr=  to->ptr;
-  to_length=to_field->pack_length();
+  to_length=to_field->pack_length_in_rec();
 
   // set up null handling
   from_null_ptr=to_null_ptr=0;