← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

Viewing changes to sql/field_conv.cc

  • Committer: Clint Byrum
  • Date: 2012-02-15 01:24:19 UTC
  • mto: This revision was merged to the branch mainline in revision 10.
  • Revision ID: clint@ubuntu.com-20120215012419-upaezkp5ynk787ki
Import upstream version 5.5.20

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/field_conv.cc
709
709
        if (((Field_varstring*) to)->length_bytes !=
710
710
            ((Field_varstring*) from)->length_bytes)
711
711
          return do_field_string;
712
 
        if (to_length != from_length)
 
712
        else
713
713
          return (((Field_varstring*) to)->length_bytes == 1 ?
714
714
                  (from->charset()->mbmaxlen == 1 ? do_varstring1 :
715
715
                                                    do_varstring1_mb) :