diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-26 20:02:21 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-26 20:02:21 +0200 |
| commit | 5f767b11e4de23d6843eebb886ddbcf185572747 (patch) | |
| tree | 14a7fc6347e350dfbf5eed7940019bbcf75eaae7 /sql/item.cc | |
| parent | ab88a1d25a95e04ff0f22ac9e8e3e69d77c428dc (diff) | |
| parent | 7c066496456b6a2665497efedab421f280ed07a9 (diff) | |
| download | mariadb-git-5f767b11e4de23d6843eebb886ddbcf185572747.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index ae73492ce94..bff8c1cace6 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table) enum_set_typelib, collation.collation); case MYSQL_TYPE_VAR_STRING: table->db_create_options|= HA_OPTION_PACK_RECORD; - return new Field_string(max_length, maybe_null, name, table, - collation.collation); + fld_type= MYSQL_TYPE_STRING; + break; default: break; } |