diff options
| author | Jorgen Loland <jorgen.loland@oracle.com> | 2011-11-18 14:47:11 +0100 |
|---|---|---|
| committer | Jorgen Loland <jorgen.loland@oracle.com> | 2011-11-18 14:47:11 +0100 |
| commit | 4fc5752fb88d1294010a62063e8f1081664286d3 (patch) | |
| tree | f2c10e722e05f8fc5af94c7fe26fe02f5983ab13 /sql/field_conv.cc | |
| parent | 4de17022c2249a6e6ff718e5f52ca1625db83c9d (diff) | |
| download | mariadb-git-4fc5752fb88d1294010a62063e8f1081664286d3.tar.gz | |
Backmerge of BUG#12997905
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) : |