summaryrefslogtreecommitdiff
path: root/mysql-test/lib/mtr_cases.pm
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/lib/mtr_cases.pm')
-rw-r--r--mysql-test/lib/mtr_cases.pm14
1 files changed, 5 insertions, 9 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index fd4832d49a3..9f2dca5efb6 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -252,15 +252,11 @@ sub collect_one_suite
}
else
{
- $suitedir= my_find_dir($::basedir,
- ["mysql-test/suite",
- "mysql-test",
- "share/mysql-test/suite",
- "share/mysql-test",
- "share/mysql/mysql-test/suite",
- "share/mysql/mysql-test",
+ $suitedir= my_find_dir($suitedir,
+ ["suite",
+ ".",
# Look in storage engine specific suite dirs
- "storage/*/mysql-test-suites"
+ "../storage/*/mysql-test-suites"
],
[$suite]);
}
@@ -573,7 +569,7 @@ sub optimize_cases {
# Check that engine selected by
# --default-storage-engine=<engine> is supported
# =======================================================
- my %builtin_engines = ('myisam' => 1, 'memory' => 1);
+ my %builtin_engines = ('myisam' => 1, 'memory' => 1, 'csv' => 1);
foreach my $opt ( @{$tinfo->{master_opt}} ) {
my $default_engine=