From 98be6efe06692a47077b269eeb26f6a11c312eeb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 17 Feb 2016 13:50:03 +0100
Subject: mtr: read both suitedir/disabled.def and suitedir/t/disabled.def

this simplifies merging of MySQL and TokuDB
---
 mysql-test/lib/mtr_cases.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mysql-test/lib/mtr_cases.pm')

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index b95fcb3825c..b76b10d42ed 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -498,6 +498,7 @@ sub process_suite {
 
     # disabled.def
     parse_disabled($suite->{dir} .'/disabled.def', $suitename);
+    parse_disabled($suite->{dir} .'/t/disabled.def', $suitename);
 
     # combinations
     if (@::opt_combinations)
-- 
cgit v1.2.1