From 1d9ab18a1a77d9323ac09512627e4b10f64e74ae Mon Sep 17 00:00:00 2001
From: Luis Soares <luis.soares@sun.com>
Date: Wed, 2 Jun 2010 12:20:43 +0100
Subject: [PATCH] BUG#54161: MTR: disabled.def lists don't work with FQ test
 names

MTR will ignore fully qualified test name entries in disabled.def
lists. Therefore, it would still run the test case, even if it is
listed.

This patch fix this by extending the check when marking the test
case as disabled to take into consideration not only the cases that
contain the simple test name but also those that contain fully
qualified test names.
---
 mysql-test/lib/mtr_cases.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index cf84c0ad31f..ea3a1efce55 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -768,11 +768,13 @@ sub collect_one_test_case {
   # Check for disabled tests
   # ----------------------------------------------------------------------
   my $marked_as_disabled= 0;
-  if ( $disabled->{$tname} )
+  if ( $disabled->{$tname} or $disabled->{"$suitename.$tname"} )
   {
     # Test was marked as disabled in suites disabled.def file
     $marked_as_disabled= 1;
-    $tinfo->{'comment'}= $disabled->{$tname};
+    # Test name may have been disabled with or without suite name part
+    $tinfo->{'comment'}= $disabled->{$tname} || 
+                         $disabled->{"$suitename.$tname"};
   }
 
   my $disabled_file= "$testdir/$tname.disabled";