From a3b23403571252b9efe7ffddb7ebf5675759ce1f Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.(none)" <>
Date: Fri, 7 Jul 2006 10:47:51 -0400
Subject: [PATCH] Merge cleanup, with a change of verbose test status to Off.

---
 mysql-test/lib/mtr_process.pl | 2 +-
 mysql-test/mysql-test-run.pl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 143bb40c3d1..b593d80a5e8 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -951,7 +951,7 @@ sub mtr_kill_process ($$$) {
   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...");
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9192ea20529..43cab03f12a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -168,7 +168,7 @@ our $opt_suite;
 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....