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

into mysql.com:/home/my/mysql-4.1

Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
870b048b · unknown · 34d46e6b · 7dad3985 · 870b048b
Commit 870b048b authored Nov 12, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/field.cc sql/field.cc +1 -0

No files found.
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -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,