Merge polly.local:/tmp/maint/bug24117/my50-bug24117

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

2 files changed, 11 insertions, 0 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 4fe533c3398..1c85b5a774b 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7833,6 +7833,16 @@ void Field_enum::sql_type(String &res) const
 }
 
 
+Field *Field_enum::new_field(MEM_ROOT *root, struct st_table *new_table,
+                             bool keep_type)
+{
+  Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
+  if (res)
+    res->typelib= copy_typelib(root, typelib);
+  return res;
+}
+
+
 /*
    set type.
    This is a string which can have a collection of different values.
diff --git a/sql/field.h b/sql/field.h
index 709630218b2..b79e8fc0d13 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1285,6 +1285,7 @@ public:
   {
       flags|=ENUM_FLAG;
   }
+  Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
   enum_field_types type() const { return FIELD_TYPE_STRING; }
   enum Item_result cmp_type () const { return INT_RESULT; }
   enum Item_result cast_to_int_type () const { return INT_RESULT; }