Auto-merge from mysql-trunk.

This commit is contained in:
Alexander Nozdrin 2009-11-12 05:22:00 +03:00
commit a673c89731

View file

@ -142,8 +142,9 @@ sub fix_secure_file_priv {
sub fix_std_data { sub fix_std_data {
my ($self, $config, $group_name, $group)= @_; my ($self, $config, $group_name, $group)= @_;
my $basedir= $self->get_basedir($group); return my_find_dir($self->get_basedir($group),
return "$basedir/mysql-test/std_data"; ["share/mysql-test", "mysql-test"],
"std_data");
} }
sub ssl_supported { sub ssl_supported {