bk commit into 5.1 tree (cmiller:1.2217)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.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, 2006-07-07 10:47:51-04:00, cmiller@zippy.(none) +2 -0
  Merge cleanup, with a change of verbose test status to Off.

  mysql-test/lib/mtr_process.pl@stripped, 2006-07-07 10:47:48-04:00, cmiller@zippy.(none) +1 -1
    Resolved a previous bad merge of two different attempts at fixing the same problem.

  mysql-test/mysql-test-run.pl@stripped, 2006-07-07 10:47:48-04:00, cmiller@zippy.(none) +1 -1
    Default for verbose should be Off.

# 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.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new-maint

--- 1.42/mysql-test/lib/mtr_process.pl	2006-07-07 10:47:57 -04:00
+++ 1.43/mysql-test/lib/mtr_process.pl	2006-07-07 10:47:57 -04:00
@@ -951,7 +951,7 @@
   my $timeout= shift; # Seconds to wait for process
   my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt
 
-  for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt)
+  for (my $cur_attempt= 1; $cur_attempt <= $max_loop; ++$cur_attempt)
   {
     mtr_debug("Sending $signal to $pid...");
 

--- 1.138/mysql-test/mysql-test-run.pl	2006-07-07 10:47:57 -04:00
+++ 1.139/mysql-test/mysql-test-run.pl	2006-07-07 10:47:57 -04:00
@@ -168,7 +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
+our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
 # Options FIXME not all....