From f4fc2207273bc16467c45e80488e5073718216dd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Nov 2006 12:33:36 +0100 Subject: [PATCH] Backport of patch for bug#24471 mysql-test/lib/mtr_report.pl: Don't output "skipped" comment if there is none (bug#24471) mysql-test/mysql-test-run.pl: Removed "use diagnostics", reduces Perl speed significantly. Can be enabled with "perl -Mdiagnostics mysql-test-run.pl". --- 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