diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-07 14:59:53 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-07 14:59:53 +0500 |
| commit | 023ae2a040e43f40aab2bd40311c84e45bee97ff (patch) | |
| tree | 20ab7d376b5edd5f5fcc4004f18c43aadaf05b77 /sql/field.cc | |
| parent | be3bc128abb09641f0d03216101c4d6938af4245 (diff) | |
| parent | 795121926ef797fd9988ee65b97b16af0ace9af8 (diff) | |
| download | mariadb-git-023ae2a040e43f40aab2bd40311c84e45bee97ff.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/rpl_packet.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/rpl_packet.test:
Auto merged
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/r/create.result:
SCCS merged
mysql-test/t/create.test:
merging
mysql-test/t/disabled.def:
merging
sql/events.cc:
merging
sql/sql_parse.cc:
SCCS 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 460c4fdae11..a48a3ff7bcd 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8900,11 +8900,6 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, break; case MYSQL_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); |