From ee4a5b865fe13bb493c232d9eb57ee89132487b5 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 28 Nov 2006 10:31:07 +0100
Subject: [PATCH] Backport of patch for bug#24471 mysql-test-run.pl:    
 Removed "use diagnostics", reduces Perl speed significantly. Can be    
 enabled with "perl -Mdiagnostics mysql-test-run.pl". mtr_report.pl:    Don't
 try output "skipped" comment if there is none (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 758e98984b8..a2c16e1941a 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -94,10 +94,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 5fe95fc3c6c..ab347157168 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