diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 13:50:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 15:10:58 +0100 |
| commit | 98be6efe06692a47077b269eeb26f6a11c312eeb (patch) | |
| tree | cee9c9de90384e7668aaad3772c5897b1ad9585a /mysql-test/lib/mtr_cases.pm | |
| parent | dc92263ab3d2649d657bfd586b4500704d08cbe4 (diff) | |
| download | mariadb-git-98be6efe06692a47077b269eeb26f6a11c312eeb.tar.gz | |
mtr: read both suitedir/disabled.def and suitedir/t/disabled.def
this simplifies merging of MySQL and TokuDB
Diffstat (limited to 'mysql-test/lib/mtr_cases.pm')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 1 |
1 files changed, 1 insertions, 0 deletions
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) |