Commit ce02a55c authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 378c506d 3767fb01

sql/field.cc

+2 −2
Original line number Diff line number Diff line
@@ -7879,7 +7879,7 @@ int Field_bit::key_cmp(const byte *str, uint length) 
    str++;

    length--;

  }

  return bcmp(ptr, str, length);

  return memcmp(ptr, str, length);

}
@@ -7893,7 +7893,7 @@ int Field_bit::cmp_offset(uint row_offset) 
    if ((flag= (int) (bits_a - bits_b)))

      return flag;

  }

  return bcmp(ptr, ptr + row_offset, field_length);

  return memcmp(ptr, ptr + row_offset, field_length);

}

sql/sql_table.cc

+3 −1
Original line number Diff line number Diff line
@@ -563,7 +563,9 @@ int prepare_create_field(create_field *sql_field, 
    sql_field->pack_flag=f_settype((uint) sql_field->sql_type);

    break;

  case FIELD_TYPE_BIT:

    sql_field->pack_flag|= FIELDFLAG_NUMBER;

    sql_field->pack_flag= f_bit_as_char(sql_field->pack_flag) ? 

                          FIELDFLAG_NUMBER | FIELDFLAG_TREAT_BIT_AS_CHAR :

                          FIELDFLAG_NUMBER;

    break;

  case FIELD_TYPE_NEWDECIMAL:

    sql_field->pack_flag=(FIELDFLAG_NUMBER |