bk commit into 5.1 tree (msvensson:1.2148)

[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
  1.2148 06/05/19 11:42:53 msvensson@shellback.(none) +3 -0
  Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/mysql-test-run.pl
    1.117 06/05/19 11:42:44 msvensson@shellback.(none) +8 -5
    Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/lib/mtr_report.pl
    1.27 06/05/19 11:42:44 msvensson@shellback.(none) +7 -0
    Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/lib/mtr_process.pl
    1.34 06/05/19 11:42:44 msvensson@shellback.(none) +4 -5
    Add mtr_verbose to print more verbose output when --verbose flag is used

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.33/mysql-test/lib/mtr_process.pl	2006-05-18 23:34:57 +02:00
+++ 1.34/mysql-test/lib/mtr_process.pl	2006-05-19 11:42:44 +02:00
@@ -661,14 +661,13 @@
   # Return if no processes defined
   return if ! %$admin_pids;
 
-  # mtr_report("mtr_wait_blocking");
+  mtr_verbose("mtr_wait_blocking");
 
   # Wait for all the started processes to exit
   # As mysqladmin is such a simple program, we trust it to terminate itself.
   # I.e. we wait blocking, and wait wait for them all before we go on.
   foreach my $pid (keys %{$admin_pids})
   {
-    # mtr_report("pid: $pid");
     my $ret_pid= waitpid($pid,0);
 
   }
@@ -708,7 +707,7 @@
   my $pid= mtr_spawn($::exe_mysqladmin, $args,
 		     "", $path_mysqladmin_log, $path_mysqladmin_log, "",
 		     { append_log_file => 1 });
-  # mtr_report("mtr_mysqladmin_start, pid: $pid");
+  mtr_verbose("mtr_mysqladmin_start, pid: $pid");
   return $pid;
 
 }
@@ -733,7 +732,7 @@
   my $pid= mtr_spawn($::exe_ndb_mgm, $args,
 		     "", "/dev/null", "/dev/null", "",
 		     {});
-  # mtr_report("mtr_ndbmgm_start, pid: $pid");
+  mtr_verbose("mtr_ndbmgm_start, pid: $pid");
   return $pid;
 
 }
@@ -926,7 +925,7 @@
 
 sub mtr_kill_processes ($) {
   my $pids = shift;
-  # mtr_report("mtr_kill_processes " . join(" ", @$pids));
+  mtr_verbose("mtr_kill_processes " . join(" ", @$pids));
   foreach my $sig (15, 9)
   {
     my $retries= 10;

--- 1.26/mysql-test/lib/mtr_report.pl	2006-05-18 23:34:57 +02:00
+++ 1.27/mysql-test/lib/mtr_report.pl	2006-05-19 11:42:44 +02:00
@@ -21,6 +21,7 @@
 sub mtr_error (@);
 sub mtr_child_error (@);
 sub mtr_debug (@);
+sub mtr_verbose (@);
 
 
 ##############################################################################
@@ -340,6 +341,12 @@
   if ( $::opt_script_debug )
   {
     print STDERR "####: ",join(" ", @_),"\n";
+  }
+}
+sub mtr_verbose (@) {
+  if ( $::opt_verbose )
+  {
+    print STDERR "> ",join(" ", @_),"\n";
   }
 }
 

--- 1.116/mysql-test/mysql-test-run.pl	2006-05-19 09:13:16 +02:00
+++ 1.117/mysql-test/mysql-test-run.pl	2006-05-19 11:42:44 +02:00
@@ -168,6 +168,7 @@
 our $opt_netware;
 
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
+our $opt_verbose= 1;  # Verbose output, enable with --verbose
 
 # Options FIXME not all....
 
@@ -656,6 +657,7 @@
              'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
              'script-debug'             => \$opt_script_debug,
+             'verbose'                  => \$opt_verbose,
              'sleep=i'                  => \$opt_sleep,
              'socket=s'                 => \$opt_socket,
              'start-dirty'              => \$opt_start_dirty,
@@ -1635,7 +1637,7 @@
 		  "--ndb-connectstring=$cluster->{'connect_string'}",
 		  "--timeout=60"],
 		 "", $path_waiter_log, $path_waiter_log, "");
-  # mtr_report("ndbcluster_wait_started, returns: $res") if $res;
+  mtr_verbose("ndbcluster_wait_started, returns: $res") if $res;
   return $res;
 }
 
@@ -1662,7 +1664,7 @@
 
   # Remember pid of ndb_mgmd
   $cluster->{'pid'}= $pid;
-  # mtr_report("ndb_mgmd_start, pid: $pid");
+  mtr_verbose("ndb_mgmd_start, pid: $pid");
   return $pid;
 }
 
@@ -1694,7 +1696,7 @@
   # Add pid to list of pids for this cluster
   $cluster->{'ndbds'}->[$idx]->{'pid'}= $pid;
 
-  # mtr_report("ndbd_start, pid: $pid");
+  mtr_verbose("ndbd_start, pid: $pid");
 
   return $pid;
 }
@@ -1704,7 +1706,7 @@
   my $cluster= shift;
   my $extra_args= shift;
 
-  # mtr_report("ndbcluster_start '$cluster->{'name'}'");
+  mtr_verbose("ndbcluster_start '$cluster->{'name'}'");
 
   if ( $glob_use_running_ndbcluster )
   {
@@ -2806,7 +2808,7 @@
 
   # Remember pid of the started process
   $mysqld->{'pid'}= $pid;
-  # mtr_report("mysqld pid: $pid");
+  mtr_verbose("mysqld pid: $pid");
   return $pid;
 }
 
@@ -3948,6 +3950,7 @@
   comment=STR           Write STR to the output
   notimer               Don't show test case execution time
   script-debug          Debug this script itself
+  verbose               More verbose output
   start-and-exit        Only initialize and start the servers, using the
                         startup settings for the specified test case (if any)
   start-dirty           Only start the servers (without initialization) for