bk commit into 5.0 tree (kaa:1.2356)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-14 14:30:58+03:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug24117/my50-bug24117
  into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
  MERGE: 1.2327.3.1

  sql/field.cc@stripped, 2006-12-14 14:30:55+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.328.1.1

  sql/field.h@stripped, 2006-12-14 14:30:55+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.189.2.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.0-maint/RESYNC

--- 1.333/sql/field.cc	2006-12-14 14:31:04 +03:00
+++ 1.334/sql/field.cc	2006-12-14 14:31:04 +03:00
@@ -988,6 +988,51 @@ Item_result Field::result_merge_type(enu
 
 
 /*
+  Create a copy of a specified TYPELIB structure.
+
+  SYNOPSIS
+    copy_typelib()
+    root	pointer to a MEM_ROOT object for allocations
+    from	pointer to a source TYPELIB structure
+
+  RETURN
+    pointer to the new TYPELIB structure on successful copy, or
+    NULL otherwise
+*/
+
+static TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from)
+{
+  TYPELIB *to;
+
+  if (!from)
+    return NULL;
+
+  if (!(to= (TYPELIB*) alloc_root(root, sizeof(TYPELIB))))
+    return NULL;
+
+  if (!(to->type_names= (const char **)
+        alloc_root(root, (sizeof(char *) + sizeof(int)) * (from->count + 1))))
+    return NULL;
+  to->type_lengths= (unsigned int *)(to->type_names + from->count + 1);
+  to->count= from->count;
+  if (from->name && !(to->name= strdup_root(root, from->name)))
+    return NULL;
+
+  for (uint i= 0; i < from->count; i++)
+  {
+    if (!(to->type_names[i]= strmake_root(root, from->type_names[i],
+                                          from->type_lengths[i])))
+      return NULL;
+    to->type_lengths[i]= from->type_lengths[i];
+  }
+  to->type_names[to->count]= NULL;
+  to->type_lengths[to->count]= 0;
+
+  return to;
+}
+
+
+/*
   Check whether a field type can be partially indexed by a key
 
   This is a static method, rather than a virtual function, because we need
@@ -7833,6 +7878,16 @@ void Field_enum::sql_type(String &res) c
 }
 
 
+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.
@@ -7945,6 +8000,7 @@ void Field_set::sql_type(String &res) co
   }
   res.append(')');
 }
+
 
 /* returns 1 if the fields are equally defined */
 

--- 1.191/sql/field.h	2006-12-14 14:31:04 +03:00
+++ 1.192/sql/field.h	2006-12-14 14:31:04 +03:00
@@ -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; }