From 7dfe47350da80595e7f97ff4eb3dea25adad3ede Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Thu, 28 Jul 2011 12:54:02 +0200
Subject: [PATCH 1/2] Bug #12726039 MTR SHOULD PROVIDE ABILITY TO DISABLE TEST
 ON SELECTED PLATFORMS   Add extra patterns to look for @<platform>

---
 mysql-test/lib/mtr_cases.pm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 708b8e90fc4..3dcd99f235f 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -317,10 +317,30 @@ sub collect_one_suite($)
   my %disabled;
   if ( open(DISABLED, "$testdir/disabled.def" ) )
   {
+    # $^O on Windows considered not generic enough
+    my $plat= (IS_WINDOWS) ? 'windows' : $^O;
+
     while ( <DISABLED> )
       {
         chomp;
-        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
+        #diasble the test case if platform matches
+        if ( /\@/ )
+          {
+             if ( /\@$plat/ )
+               {
+        	  /^\s*(\S+)\s*\@$plat.*:\s*(.*?)\s*$/ ;
+                  $disabled{$1}= $2;
+               }
+             elsif ( /\@!(\S*)/ )
+               {
+                  if ( $1 ne $plat)
+                    {
+        	       /^\s*(\S+)\s*\@!.*:\s*(.*?)\s*$/ ;
+                       $disabled{$1}= $2;
+                    }
+               }
+          }
+       elsif ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
           {
             $disabled{$1}= $2;
           }

From 10f8e406adfec177cd25db9fc25335f977e7cbfb Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Thu, 28 Jul 2011 13:01:51 +0200
Subject: [PATCH 2/2] Fixed test ndb.ndb_partition_error2, didn't include
 have_ndb.inc

---
 mysql-test/suite/ndb/t/ndb_partition_error2.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/suite/ndb/t/ndb_partition_error2.test b/mysql-test/suite/ndb/t/ndb_partition_error2.test
index afedd0e3c5c..58c38f2dd37 100644
--- a/mysql-test/suite/ndb/t/ndb_partition_error2.test
+++ b/mysql-test/suite/ndb/t/ndb_partition_error2.test
@@ -1,3 +1,4 @@
+-- source include/have_ndb.inc
 disable_query_log;
 --require r/true.require
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';