diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-07 11:36:02 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-07 11:36:02 +0500 |
commit | b3f9c888268d86eae06cdfc4c0abd3b0ac8f4015 (patch) | |
tree | 8feb71327870547e39472a293cc26d113097c968 /sql/field.cc | |
parent | d6a78be9f2e68dcfffd388cbc5893417da1975a9 (diff) | |
parent | 89aa5548cea2c107049e40ef5e50696ac0194a23 (diff) | |
download | mariadb-git-b3f9c888268d86eae06cdfc4c0abd3b0ac8f4015.tar.gz |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
sql/field.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/field.cc b/sql/field.cc index f80bf12db92..635b10e0e5e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8595,11 +8595,6 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, break; case FIELD_TYPE_SET: { - if (fld_interval_list->elements > sizeof(longlong)*8) - { - my_error(ER_TOO_BIG_SET, MYF(0), fld_name); /* purecov: inspected */ - DBUG_RETURN(TRUE); - } pack_length= get_set_pack_length(fld_interval_list->elements); List_iterator<String> it(*fld_interval_list); |