Auto-merge from mysql-trunk.

a673c897 · Alexander Nozdrin · e2f935ef · 732597b5 · a673c897
Commit a673c897 authored Nov 12, 2009 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/ConfigFactory.pm +3 -2

No files found.
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -142,8 +142,9 @@ sub fix_secure_file_priv {
 sub fix_std_data {
  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 {