bk commit into 5.1 tree (ramil:1.2382)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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-21 10:01:57+04:00, ramil@stripped +5 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/ram/work/mysql-5.1-maint
  MERGE: 1.2356.1.4

  mysql-test/Makefile.am@stripped, 2006-12-21 10:01:52+04:00, ramil@stripped
+0 -1
    Auto merged
    MERGE: 1.91.1.1

  scripts/mysqld_multi.sh@stripped, 2006-12-21 10:01:52+04:00, ramil@stripped
+0 -0
    Auto merged
    MERGE: 1.30.1.2

  sql/field.cc@stripped, 2006-12-21 10:01:52+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.359.1.2

  sql/field.h@stripped, 2006-12-21 10:01:52+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.196.1.2

  sql/sql_class.h@stripped, 2006-12-21 10:01:52+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.331.1.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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/mysql-5.1-maint/RESYNC

--- 1.360/sql/field.cc	2006-12-21 10:02:02 +04:00
+++ 1.361/sql/field.cc	2006-12-21 10:02:02 +04:00
@@ -8031,6 +8031,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.

--- 1.197/sql/field.h	2006-12-21 10:02:02 +04:00
+++ 1.198/sql/field.h	2006-12-21 10:02:02 +04:00
@@ -1367,6 +1367,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; }

--- 1.31/scripts/mysqld_multi.sh	2006-12-21 10:02:02 +04:00
+++ 1.32/scripts/mysqld_multi.sh	2006-12-21 10:02:02 +04:00
@@ -472,6 +472,14 @@ sub find_groups
     {
       $data[$i] = $line;
     }
+    if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")
+    {
+      open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) &&
close(MY_CNF);
+    }
+    for (; ($line = shift @tmp); $i++)
+    {
+      $data[$i] = $line;
+    }
     if (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&
 	-r "$ENV{MYSQL_HOME}/my.cnf")
     {
@@ -482,6 +490,14 @@ sub find_groups
     {
       $data[$i] = $line;
     }
+    if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")
+    {
+      open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) &&
close(MY_CNF);
+    }
+    for (; ($line = shift @tmp); $i++)
+    {
+      $data[$i] = $line;
+    }
     if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")
     {
       open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) &&
close(MY_CNF);
@@ -491,7 +507,7 @@ sub find_groups
       $data[$i] = $line;
     }
   }
-  chop @data;
+  chomp @data;
   # Make a list of the wanted group ids
   if (defined($raw_gids))
   {