summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-01 17:04:57 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-01 17:04:57 +0100
commit90696456b99050bc69bc89693dbb0fbd8eb5005e (patch)
treed096cfb9abb31601e06395efd1d095d644254063 /mysql-test/lib
parentd707113ebd14bb8bd7fbea41b606f3d44d2880c1 (diff)
downloadmariadb-git-90696456b99050bc69bc89693dbb0fbd8eb5005e.tar.gz
misc test/result fixes
mysql-test/include/have_xtradb.combinations: xtradb tests need this I_S table mysql-test/lib/mtr_cases.pm: fix for .deb and .rpm installations
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_cases.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 11c8b2a6b35..beb0716d4a7 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -333,7 +333,7 @@ sub collect_one_suite
}
else
{
- @overlays = my_find_dir($::basedir,
+ @overlays = my_find_dir(dirname($::glob_mysql_test_dir),
["mysql-test/suite",
"storage/*/mysql-test",
"plugin/*/mysql-test"],
@@ -354,7 +354,7 @@ sub collect_one_suite
$suitedir = shift @overlays;
}
} else {
- @overlays = my_find_dir($::basedir,
+ @overlays = my_find_dir(dirname($::glob_mysql_test_dir),
["storage/*/mysql-test",
"plugin/*/mysql-test"],
['main'], NOT_REQUIRED);