← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/field_conv.cc

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/field_conv.cc
642
642
  }
643
643
  else
644
644
  {
645
 
    if (to->real_type() == MYSQL_TYPE_BIT ||
646
 
        from->real_type() == MYSQL_TYPE_BIT)
647
 
      return do_field_int;
648
645
    if (to->result_type() == DECIMAL_RESULT)
649
646
      return do_field_decimal;
650
647
    // Check if identical fields
759
756
    if (to->pack_length() == from->pack_length() && 
760
757
        !(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) && 
761
758
        to->real_type() != MYSQL_TYPE_ENUM && 
762
 
        to->real_type() != MYSQL_TYPE_SET && to->real_type() != MYSQL_TYPE_BIT &&
 
759
        to->real_type() != MYSQL_TYPE_SET &&
763
760
        (to->real_type() != MYSQL_TYPE_NEWDECIMAL || (to->field_length == from->field_length && (((Field_num*)to)->dec == ((Field_num*)from)->dec))) &&
764
761
        from->charset() == to->charset() &&
765
762
        to->table->s->db_low_byte_first == from->table->s->db_low_byte_first &&