summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-06-15 11:16:38 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2010-06-15 11:16:38 +0200
commit4316bf37f042fce342ac8b984976030e550e8d16 (patch)
treeff2322e5f25ca55b05937f866e6240c4a8420f73 /mysql-test/mysql-test-run.pl
parentf9fa3b7a3fe4846b32fc51e7e356ee6af25492ac (diff)
downloadmariadb-git-4316bf37f042fce342ac8b984976030e550e8d16.tar.gz
Bug #52321 mtr test suite paths need to be updated
Use $suitedir instead of $basedir to find suites Add 'testdir' to ConfigFactory
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 91ae508422f..f58e78d5b77 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2742,6 +2742,7 @@ sub default_mysqld {
my $config= My::ConfigFactory->new_config
( {
basedir => $basedir,
+ testdir => $glob_mysql_test_dir,
template_path => "include/default_my.cnf",
vardir => $opt_vardir,
tmpdir => $opt_tmpdir,
@@ -3350,6 +3351,7 @@ sub run_testcase ($) {
$config= My::ConfigFactory->new_config
( {
basedir => $basedir,
+ testdir => $glob_mysql_test_dir,
template_path => $tinfo->{template_path},
extra_template_path => $tinfo->{extra_template_path},
vardir => $opt_vardir,