diff options
| author | Jorgen Loland <jorgen.loland@oracle.com> | 2011-11-18 14:53:54 +0100 |
|---|---|---|
| committer | Jorgen Loland <jorgen.loland@oracle.com> | 2011-11-18 14:53:54 +0100 |
| commit | 90eceaa18e7f923f01b07aa6e8046616ef6dc36b (patch) | |
| tree | a4eace05cadaa9ce0751f0e5a078ba97794c0314 /sql/field_conv.cc | |
| parent | b8ca26691d30282285cb7bc07f1a1d79a3e2fddd (diff) | |
| parent | 4fc5752fb88d1294010a62063e8f1081664286d3 (diff) | |
| download | mariadb-git-90eceaa18e7f923f01b07aa6e8046616ef6dc36b.tar.gz | |
Merge BUG#12997905 from 5.1 to 5.5
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 1a3ac9de08b..594449174bc 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -709,7 +709,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) : |