bk commit into 5.1 tree (tsmith:1.2384)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim 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 18:23:14-07:00, tsmith@stripped +9 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/g51
  into  siva.hindu.god:/usr/home/tim/m/bk/51
  MERGE: 1.2356.1.11

  mysql-test/Makefile.am@stripped, 2006-12-21 18:23:07-07:00, tsmith@stripped +0 -1
    Auto merged
    MERGE: 1.91.1.2

  mysql-test/mysql-test-run.pl@stripped, 2006-12-21 18:23:07-07:00, tsmith@stripped +0
-0
    Auto merged
    MERGE: 1.254.1.2

  mysql-test/t/myisam.test@stripped, 2006-12-21 18:23:07-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.71.1.1

  mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-21 18:23:07-07:00, tsmith@stripped
+0 -0
    Auto merged
    MERGE: 1.67.1.1

  scripts/make_binary_distribution.sh@stripped, 2006-12-21 18:23:07-07:00,
tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.135.1.1

  scripts/mysqld_multi.sh@stripped, 2006-12-21 18:23:07-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.30.1.2

  sql/field.cc@stripped, 2006-12-21 18:23:08-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.359.1.2

  sql/field.h@stripped, 2006-12-21 18:23:08-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.196.1.2

  sql/sql_class.h@stripped, 2006-12-21 18:23:08-07:00, tsmith@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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/51/RESYNC

--- 1.136/scripts/make_binary_distribution.sh	2006-12-21 18:23:23 -07:00
+++ 1.137/scripts/make_binary_distribution.sh	2006-12-21 18:23:23 -07:00
@@ -246,6 +246,7 @@ $CP mysql-test/include/*.inc $BASE/mysql
 $CP mysql-test/include/*.test $BASE/mysql-test/include
 $CP mysql-test/t/*.def $BASE/mysql-test/t
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
+    mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
     mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \

--- 1.360/sql/field.cc	2006-12-21 18:23:23 -07:00
+++ 1.361/sql/field.cc	2006-12-21 18:23:23 -07: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 18:23:23 -07:00
+++ 1.198/sql/field.h	2006-12-21 18:23:23 -07: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 18:23:23 -07:00
+++ 1.32/scripts/mysqld_multi.sh	2006-12-21 18:23:23 -07: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))
   {

--- 1.258/mysql-test/mysql-test-run.pl	2006-12-21 18:23:23 -07:00
+++ 1.259/mysql-test/mysql-test-run.pl	2006-12-21 18:23:23 -07:00
@@ -58,6 +58,7 @@ $Devel::Trace::TRACE= 0;       # Don't t
 use File::Path;
 use File::Basename;
 use File::Copy;
+use File::Temp qw / tempdir /;
 use Cwd;
 use Getopt::Long;
 use Sys::Hostname;
@@ -1032,6 +1033,11 @@ sub command_line_setup () {
   # paths.
   my $sockdir = $opt_tmpdir;
   $sockdir =~ s|/+$||;
+
+  # On some operating systems, there is a limit to the length of a
+  # UNIX domain socket's path far below PATH_MAX, so try to avoid long
+  # socket path names.
+  $sockdir = tempdir(CLEANUP => 1) if ( length($sockdir) > 80 );
 
   # Put this into a hash, will be a C struct
 

--- 1.74/mysql-test/t/myisam.test	2006-12-21 18:23:23 -07:00
+++ 1.75/mysql-test/t/myisam.test	2006-12-21 18:23:23 -07:00
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5
 insert into t2 values (1,1),(2,1);
 lock tables t1 read local, t2 read local;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 insert into t2 values(2,0);
 disconnect root;
 connection default;

--- 1.68/mysql-test/t/rpl_rotate_logs.test	2006-12-21 18:23:23 -07:00
+++ 1.69/mysql-test/t/rpl_rotate_logs.test	2006-12-21 18:23:23 -07:00
@@ -20,8 +20,10 @@ connect (master,localhost,root,,test,$MA
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
-system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
-system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
+# Create empty file
+write_file $MYSQLTEST_VARDIR/slave-data/master.info;
+EOF
+chmod 0000 $MYSQLTEST_VARDIR/slave-data/master.info;
 connection slave;
 --disable_warnings
 drop table if exists t1, t2, t3, t4;
@@ -32,7 +34,7 @@ drop table if exists t1, t2, t3, t4;
 --replace_result $MYSQL_TEST_DIR TESTDIR
 --error 1105,1105,29
 start slave;
-system chmod 600  $MYSQLTEST_VARDIR/slave-data/master.info;
+chmod 0600  $MYSQLTEST_VARDIR/slave-data/master.info;
 # It will fail again because the file is empty so the slave cannot get valuable
 # info about how to connect to the master from it (failure in
 # init_strvar_from_file() in init_master_info()).