From b93fb0ab5f8d41cb9ee0f93a7bf09835da18aabf Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Wed, 21 Jan 2009 17:32:05 +0800
Subject: [PATCH] BUG#41177 mtr gives no debug info after failing to execute
 check-testcase/check-warnings

Log output of mysqltest when running check-testcase together
with errput. Remove --silent option for mysqltest when running
check-testcase/check-warnings


mysql-test/mysql-test-run.pl:
  Log output of mysqltest when runinng check-testcase together with errput.
  Remove --silent option for mysqltest when running check-testcase/check-warnings
---
 mysql-test/mysql-test-run.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index cdb1352e7f6..e3710e505e1 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3347,7 +3347,6 @@ sub start_check_warnings ($$) {
   mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
   mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
 
-  mtr_add_arg($args, "--silent");
   mtr_add_arg($args, "--skip-safemalloc");
   mtr_add_arg($args, "--test-file=%s", "include/check-warnings.test");
 
@@ -4325,7 +4324,6 @@ sub start_check_testcase ($$$) {
   mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
   mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
 
-  mtr_add_arg($args, "--silent");
   mtr_add_arg($args, "--skip-safemalloc");
 
   mtr_add_arg($args, "--result-file=%s", "$opt_vardir/tmp/$name.result");
@@ -4341,6 +4339,7 @@ sub start_check_testcase ($$$) {
      name          => $name,
      path          => $exe_mysqltest,
      error         => $errfile,
+     output        => $errfile,
      args          => \$args,
      user_data     => $errfile,
      verbose       => $opt_verbose,