1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

mtr: read both suitedir/disabled.def and suitedir/t/disabled.def

this simplifies merging of MySQL and TokuDB
This commit is contained in:
Sergei Golubchik
2016-02-17 13:50:03 +01:00
parent dc92263ab3
commit 98be6efe06

View File

@ -498,6 +498,7 @@ sub process_suite {
# disabled.def # disabled.def
parse_disabled($suite->{dir} .'/disabled.def', $suitename); parse_disabled($suite->{dir} .'/disabled.def', $suitename);
parse_disabled($suite->{dir} .'/t/disabled.def', $suitename);
# combinations # combinations
if (@::opt_combinations) if (@::opt_combinations)