Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 727da7a9a4c..21282e9e620 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5527,9 +5527,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
 	my_error(ER_TOO_BIG_SET, MYF(0), field_name); /* purecov: inspected */
 	DBUG_RETURN(NULL);
       }
-      new_field->pack_length= (interval_list->elements + 7) / 8;
-      if (new_field->pack_length > 4)
-        new_field->pack_length=8;
+      new_field->pack_length= get_set_pack_length(interval_list->elements);
 
       List_iterator<String> it(*interval_list);
       String *tmp;
@@ -5546,7 +5544,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type,
   case FIELD_TYPE_ENUM:
     {
       // Should be safe
-      new_field->pack_length= interval_list->elements < 256 ? 1 : 2; 
+      new_field->pack_length= get_enum_pack_length(interval_list->elements);
 
       List_iterator<String> it(*interval_list);
       String *tmp;