bk commit into 5.1 tree (msvensson:1.2514)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-05-28 19:45:41+02:00, msvensson@pilot.(none) +3 -0
  Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
  into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2963.2

  mysql-test/lib/mtr_process.pl@stripped, 2007-05-28 19:43:05+02:00, msvensson@pilot.(none) +1 -1
    Auto merged
    MERGE: 1.25.2.30

  mysql-test/mysql-test-run.pl@stripped, 2007-05-28 19:45:39+02:00, msvensson@pilot.(none) +4 -4
    Merge 5.0->5.1
    MERGE: 1.30.49.80

  mysys/my_init.c@stripped, 2007-05-28 19:43:05+02:00, msvensson@pilot.(none) +0 -0
    Auto merged
    MERGE: 1.44.1.5

# 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:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.56/mysys/my_init.c	2007-02-23 12:23:37 +01:00
+++ 1.57/mysys/my_init.c	2007-05-28 19:43:05 +02:00
@@ -267,6 +267,34 @@
 }
 
 
+#ifdef __MSVC_RUNTIME_CHECKS
+#include <rtcapi.h>
+
+/* Turn off runtime checks for 'handle_rtc_failure' */
+#pragma runtime_checks("", off)
+
+/*
+  handle_rtc_failure
+  Catch the RTC error and dump it to stderr
+*/
+
+int handle_rtc_failure(int err_type, const char *file, int line,
+                       const char* module, const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  fprintf(stderr, "Error:");
+  vfprintf(stderr, format, args);
+  fprintf(stderr, " At %s:%d\n", file, line);
+  va_end(args);
+  (void) fflush(stderr);
+
+  return 0; /* Error is handled */
+}
+#pragma runtime_checks("", on)
+#endif
+
+
 static void my_win_init(void)
 {
   HKEY	hSoftMysql ;
@@ -297,6 +325,14 @@
   _set_invalid_parameter_handler(my_parameter_handler);
 #endif
 #endif  
+#ifdef __MSVC_RUNTIME_CHECKS
+  /*
+    Install handler to send RTC (Runtime Error Check) warnings
+    to log file
+  */
+  _RTC_SetErrorFunc(handle_rtc_failure);
+#endif
+
   _tzset();
 
   /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */

--- 1.74/mysql-test/lib/mtr_process.pl	2007-05-28 19:40:02 +02:00
+++ 1.75/mysql-test/lib/mtr_process.pl	2007-05-28 19:43:05 +02:00
@@ -608,6 +608,14 @@
     if ( $srv->{'pid'} )
     {
       $mysqld_pids{$srv->{'pid'}}= 1;
+
+      if ($::glob_win32_perl)
+      {
+        # Get the  real pid from pidfile and add it to the
+        # list of pids to kill
+        my $real_pid= mtr_get_pid_from_file($srv->{'pidfile'});
+        $mysqld_pids{$real_pid}= 1;
+      }
     }
     else
     {
@@ -1101,8 +1109,12 @@
 
   foreach my $pid (@$pids)
   {
-
-    if ($pid <= 0)
+    if ($::glob_win32_perl)
+    {
+      # Any pid is legal in ActiveState perl
+      # Negative number just indicates it's a pseudo pid
+    }
+    elsif ($pid <= 0)
     {
       mtr_warning("Trying to kill illegal pid: $pid");
       next;
@@ -1110,6 +1122,17 @@
 
     foreach my $sig (15, 9)
     {
+
+      if ($::glob_win32_perl and $pid < 0 and $sig == 15)
+      {
+        # Pseudo pids(threads in the same process) are being used,
+        # trying to kill one of those with "kill -15 $pid" will cause the
+        # pseudo thread to call exit(15)" - see perl-X.X.X/win32/win32.c in the
+        # function 'sig_terminate' - and thus terminating
+        # the whole script
+        next;
+      }
+
       last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
     }
   }

--- 1.307/mysql-test/mysql-test-run.pl	2007-05-28 19:40:02 +02:00
+++ 1.308/mysql-test/mysql-test-run.pl	2007-05-28 19:45:39 +02:00
@@ -3328,8 +3328,9 @@
   my ($tinfo)= @_;
 
   # Open mysqltest-time
-  my $F= IO::File->new($path_timefile) or
-    mtr_error("can't open file \"$path_timefile\": $!");
+  my $F= IO::File->new("$path_timefile") or
+    mtr_warning("can't open file \"$path_timefile\": $!") and return;
+
   my $reason;
 
   while ( my $line= <$F> )
@@ -3383,7 +3384,7 @@
 
   # Open mysqltest.log
   my $F= IO::File->new($path_timefile) or
-    mtr_error("can't open file \"$path_timefile\": $!");
+    mtr_warning("can't open file \"$path_timefile\": $!") and return;
 
   while ( my $line= <$F> )
   {
@@ -3838,6 +3839,22 @@
     }
 
 
+    if ( $mysql_version_id <= 50106 )
+    {
+      # Force mysqld to use log files up until 5.1.6
+      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
+    }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
+
+    # Set name of stderr log
+    mtr_add_arg($args, "%s--log-error=%s", $prefix,
+		$master->[$idx]->{'path_myerr'});
+
+
       mtr_add_arg($args, "%s--plugin_dir=%s", $prefix,
 		  dirname($lib_example_plugin));
   }
@@ -3914,6 +3931,23 @@
       mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
     }
 
+
+    if ( $mysql_version_id <= 50106 )
+    {
+      # Force mysqld to use log files up until 5.1.6
+      mtr_add_arg($args, "%s--log=%s", $prefix, $slave->[0]->{'path_mylog'});
+    }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
+
+    # Set name of stderr log
+    mtr_add_arg($args, "%s--log-error=%s", $prefix,
+		$master->[$idx]->{'path_myerr'});
+
+
   } # end slave
 
   if ( $opt_debug )
@@ -4058,11 +4092,7 @@
 
   if ( defined $exe )
   {
-    $pid= mtr_spawn($exe, $args, "",
-		    $mysqld->{'path_myerr'},
-		    $mysqld->{'path_myerr'},
-		    "",
-		    { append_log_file => 1 });
+    $pid= mtr_spawn($exe, $args, "","","","",{});
   }