bk commit into 5.0 tree (msvensson:1.2579)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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-11-05 15:51:18+01:00, msvensson@stripped +2 -0
  Remove debug printouts

  mysql-test/lib/My/SafeProcess.pm@stripped, 2007-11-05 15:51:15+01:00, msvensson@stripped +2 -9
    Remove debug printouts

  mysql-test/mysql-test-run.pl@stripped, 2007-11-05 15:51:14+01:00, msvensson@stripped +0 -2
    Remove debug printouts

diff -Nrup a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
--- a/mysql-test/lib/My/SafeProcess.pm	2007-11-05 15:09:41 +01:00
+++ b/mysql-test/lib/My/SafeProcess.pm	2007-11-05 15:51:15 +01:00
@@ -254,14 +254,13 @@ sub shutdown {
 
   return if (@processes == 0);
 
-  print "shutdown: @processes\n";
+  #print "shutdown: @processes\n";
 
   # Call shutdown function if process has one, else
   # use kill
   foreach my $proc (@processes){
     my $shutdown= $proc->{SAFE_SHUTDOWN};
     if ($shutdown_timeout > 0 and defined $shutdown){
-      print "calling shutdown function\n";
       $shutdown->();
     }
     else {
@@ -275,13 +274,8 @@ sub shutdown {
   foreach my $proc (@processes){
     my $ret= $proc->wait_one($shutdown_timeout);
     if ($ret != 0) {
-      print "wait_one for $proc failed, ret: $ret\n";
       push(@kill_processes, $proc);
     }
-    else
-    {
-      print "got shutdown of $proc\n";
-    }
     # Only wait for the first process with shutdown timeout
     $shutdown_timeout= 0;
   }
@@ -289,7 +283,6 @@ sub shutdown {
   # Return if all servers has exited
   return if (@kill_processes == 0);
 
-  print "killing processes: @kill_processes\n";
   foreach my $proc (@kill_processes){
     $proc->start_kill();
   }
@@ -367,7 +360,7 @@ sub wait_one {
   my ($self, $timeout)= @_;
   die "usage: \$safe_proc->wait_one([timeout])" unless ref $self;
 
-  print "wait_one $self, $timeout\n";
+  #print "wait_one $self, $timeout\n";
 
   if ( ! defined($self->{SAFE_PID}) ) {
     # No pid => not running
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-11-05 15:05:27 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-11-05 15:51:14 +01:00
@@ -3291,8 +3291,6 @@ sub do_before_start_slave ($) {
 sub mysqld_stop {
   my $mysqld= shift or die "usage: mysqld_stop(<mysqld>)";
 
-  print "mysqld_stop, $mysqld\n";
-
   my $args;
   mtr_init_args(\$args);