bk commit into 4.1 tree (cmiller:1.2601)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
4.1 repository of cmiller. When cmiller 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-31 16:26:12-05:00, cmiller@stripped +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
  MERGE: 1.2594.1.21

  configure.in@stripped, 2007-01-31 16:26:10-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.425.1.1

  mysql-test/mysql-test-run.pl@stripped, 2007-01-31 16:26:10-05:00,
cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.171.1.2

  scripts/mysqld_multi.sh@stripped, 2007-01-31 16:26:10-05:00, cmiller@stripped +0
-0
    Auto merged
    MERGE: 1.25.1.1

  sql/mysqld.cc@stripped, 2007-01-31 16:26:10-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.622.1.2

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-4.1-maint/RESYNC

--- 1.623/sql/mysqld.cc	2007-01-31 16:26:15 -05:00
+++ 1.624/sql/mysqld.cc	2007-01-31 16:26:15 -05:00
@@ -355,6 +355,7 @@ ulong my_bind_addr;			/* the address we 
 volatile ulong cached_thread_count= 0;
 
 double log_10[32];			/* 10 potences */
+double log_01[32];
 time_t start_time;
 
 char mysql_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
@@ -3601,10 +3602,9 @@ static bool read_init_file(char *file_na
 #ifndef EMBEDDED_LIBRARY
 static void create_new_thread(THD *thd)
 {
+  NET *net=&thd->net;
   DBUG_ENTER("create_new_thread");
 
-  NET *net=&thd->net;				// For easy ref
-  net->read_timeout = (uint) connect_timeout;
   if (protocol_version > 9)
     net->return_errno=1;
 
@@ -3899,12 +3899,7 @@ extern "C" pthread_handler_decl(handle_c
     }
     if (sock == unix_sock)
       thd->host=(char*) my_localhost;
-#ifdef __WIN__
-    /* Set default wait_timeout */
-    ulong wait_timeout= global_system_variables.net_wait_timeout * 1000;
-    (void) setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&wait_timeout,
-                    sizeof(wait_timeout));
-#endif
+
     create_new_thread(thd);
   }
 

--- 1.26/scripts/mysqld_multi.sh	2007-01-31 16:26:15 -05:00
+++ 1.27/scripts/mysqld_multi.sh	2007-01-31 16:26:15 -05:00
@@ -440,14 +440,6 @@ 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);

--- 1.172/mysql-test/mysql-test-run.pl	2007-01-31 16:26:15 -05:00
+++ 1.173/mysql-test/mysql-test-run.pl	2007-01-31 16:26:15 -05: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;
@@ -1044,6 +1045,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 => 0) if ( length($sockdir) > 80 );
 
   # Put this into a hash, will be a C struct