After-merge fixes following Merge of Mysql 5.1.41 into MariaDB: Fix path for SSL stuff when running testsuite from installed package.

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 {