Commit 870b048b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1
parents 34d46e6b 7dad3985

sql/field.cc

+1 −0
Original line number Diff line number Diff line
@@ -5943,6 +5943,7 @@ Field *make_field(char *ptr, uint32 field_length, 
    if (!f_is_packed(pack_flag))

    {

      if (field_type == FIELD_TYPE_STRING ||

          field_type == FIELD_TYPE_DECIMAL ||   // 3.23 or 4.0 string

          field_type == FIELD_TYPE_VAR_STRING)

        return new Field_string(ptr,field_length,null_pos,null_bit,

                                unireg_check, field_name, table,