summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-25 14:00:28 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-25 14:00:28 +0100
commit36970ac4bacde2349beab85a904943b7fbf66667 (patch)
tree6c4f8a2afc28a898267a5df8616c3b607397aae7 /mysql-test/lib/My
parent3cc208730affcd167130a6cc03d3802da5e08c24 (diff)
downloadmariadb-git-36970ac4bacde2349beab85a904943b7fbf66667.tar.gz
After-merge fixes following Merge of Mysql 5.1.41 into MariaDB: Fix path for SSL stuff when running testsuite from installed package.
Diffstat (limited to 'mysql-test/lib/My')
-rw-r--r--mysql-test/lib/My/ConfigFactory.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 349cf3c4c05..3c9ddfa3814 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -142,8 +142,7 @@ sub fix_secure_file_priv {
sub fix_std_data {
my ($self, $config, $group_name, $group)= @_;
- my $basedir= $self->get_basedir($group);
- return "$basedir/mysql-test/std_data";
+ return "$::opt_vardir/std_data";
}
sub ssl_supported {