From 4fc5752fb88d1294010a62063e8f1081664286d3 Mon Sep 17 00:00:00 2001 From: Jorgen Loland Date: Fri, 18 Nov 2011 14:47:11 +0100 Subject: Backmerge of BUG#12997905 --- sql/field_conv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/field_conv.cc') diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 1dc7ec57944..ff56a1fdda8 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -707,7 +707,7 @@ Copy_field::get_copy_func(Field *to,Field *from) if (((Field_varstring*) to)->length_bytes != ((Field_varstring*) from)->length_bytes) return do_field_string; - if (to_length != from_length) + else return (((Field_varstring*) to)->length_bytes == 1 ? (from->charset()->mbmaxlen == 1 ? do_varstring1 : do_varstring1_mb) : -- cgit v1.2.1