bk commit into 5.1 tree (joerg:1.2378)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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, 2007-01-02 19:17:19+01:00, joerg@trift2. +5 -0
  Merge trift2.:/MySQL/M51/clone-5.1
  into  trift2.:/MySQL/M51/push-5.1
  MERGE: 1.2343.1.14

  mysql-test/mysql-test-run.pl@stripped, 2007-01-02 19:17:09+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.254.1.3

  mysql-test/t/rpl_000015.test@stripped, 2007-01-02 19:17:09+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.38.1.1

  server-tools/instance-manager/Makefile.am@stripped, 2007-01-02 19:17:09+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.43.1.1

  server-tools/instance-manager/guardian.cc@stripped, 2007-01-02 19:17:09+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.35.1.1

  sql/log_event.cc@stripped, 2007-01-02 19:17:10+01:00, joerg@trift2. +0 -6
    Auto merged
    MERGE: 1.259.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:	joerg
# Host:	trift2.
# Root:	/MySQL/M51/push-5.1/RESYNC

--- 1.255/mysql-test/mysql-test-run.pl	2007-01-02 19:17:34 +01:00
+++ 1.256/mysql-test/mysql-test-run.pl	2007-01-02 19:17:34 +01:00
@@ -58,6 +58,7 @@
 use File::Path;
 use File::Basename;
 use File::Copy;
+use File::Temp qw / tempdir /;
 use Cwd;
 use Getopt::Long;
 use Sys::Hostname;
@@ -1019,6 +1020,11 @@
   # 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.44/server-tools/instance-manager/Makefile.am	2007-01-02 19:17:34 +01:00
+++ 1.45/server-tools/instance-manager/Makefile.am	2007-01-02 19:17:34 +01:00
@@ -2,8 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.36/server-tools/instance-manager/guardian.cc	2007-01-02 19:17:34 +01:00
+++ 1.37/server-tools/instance-manager/guardian.cc	2007-01-02 19:17:34 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.39/mysql-test/t/rpl_000015.test	2007-01-02 19:17:34 +01:00
+++ 1.40/mysql-test/t/rpl_000015.test	2007-01-02 19:17:34 +01:00
@@ -5,7 +5,7 @@
 ##################### 
 
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 connection master;
 reset master;
 show master status;