From d1ed2e21b8855128a0cf705dc606f3b818f9a07f Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 28 Nov 2006 12:33:36 +0100
Subject: Backport of patch for bug#24471

---
 mysql-test/lib/mtr_report.pl | 6 +++++-
 mysql-test/mysql-test-run.pl | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 8d7de9d1a4b..d0e836c1a90 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -89,10 +89,14 @@ sub mtr_report_test_skipped ($) {
   {
     print "[ disabled ]  $tinfo->{'comment'}\n";
   }
-  else
+  elsif ( $tinfo->{'comment'} )
   {
     print "[ skipped ]   $tinfo->{'comment'}\n";
   }
+  else
+  {
+    print "[ skipped ]\n";
+  }
 }
 
 sub mtr_report_tests_not_skipped_though_disabled ($) {
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 22dc49c5ebd..694ff4b712e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -66,7 +66,6 @@ use IO::Socket::INET;
 use Data::Dumper;
 use strict;
 use warnings;
-use diagnostics;
 
 select(STDOUT);
 $| = 1; # Automatically flush STDOUT
-- 
cgit v1.2.1