diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-11-12 16:53:20 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-11-12 16:53:20 -0800 |
| commit | 6cd2a66820d0e36a8004bd38a416c92764c1a821 (patch) | |
| tree | f67ed7a76c5145f9132c0faeeec3fb59c0fdcd86 /sql/field_conv.cc | |
| parent | 46fe431818ed2cb725b0c4e7fafd97f263cb1109 (diff) | |
| download | mariadb-git-6cd2a66820d0e36a8004bd38a416c92764c1a821.tar.gz | |
Corrected the fix for LP bug 672551.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 9fb3e131523..74ffee3f33e 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -553,14 +553,7 @@ void Copy_field::set(uchar *to,Field *from) else { to_null_ptr= 0; // For easy debugging - /* Setup optimal copying for varchar */ - if (from->real_type() == MYSQL_TYPE_VARCHAR) - { - do_copy= (((Field_varstring*) from)->length_bytes == 1 ? - do_varstring1 : do_varstring2); - } - else - do_copy= do_field_eq; + do_copy= do_field_eq; } } @@ -722,7 +715,6 @@ Copy_field::get_copy_func(Field *to,Field *from) else return (((Field_varstring*) from)->length_bytes == 1 ? do_varstring1 : do_varstring2); - } else if (to_length < from_length) return (from->charset()->mbmaxlen == 1 ? |