database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

upmerge 52321,53374,53949,54111,54364,54368

Browse Source
This commit is contained in:
Bjorn Munch
2010-06-15 12:37:13 +02:00
parent 6377334b13 d843209485
commit 062f57e279
5 changed files with 119 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/lib/My/ConfigFactory.pm
View File

@ -30,6 +30,13 @@ sub get_basedir {
return $basedir;
}
sub get_testdir {
my ($self, $group)= @_;
my $testdir= $group->if_exist('testdir') ||
$self->{ARGS}->{testdir};
return $testdir;
}
# Retrive build directory (which is different from basedir in out-of-source build)
sub get_bindir {
if (defined $ENV{MTR_BINDIR})
@ -151,9 +158,8 @@ sub fix_secure_file_priv {
sub fix_std_data {
my ($self, $config, $group_name, $group)= @_;
return my_find_dir($self->get_basedir($group),
["share/mysql-test", "mysql-test"],
"std_data");
my $testdir= $self->get_testdir($group);
return "$testdir/std_data";
}
sub ssl_supported {