bzr commit into mysql-5.5-next-mr-bugfixing branch (jperkin:2938)

[Jonathan Perkin]

#At file:///home/sketch/bzr/mysql-next-mr-bugfixing/ based on revid:vvaintroub@stripped

 2938 Jonathan Perkin	2009-11-03 [merge]
      Merge to mysql-next-mr-bugfixing.

    modified:
      mysql-test/lib/My/ConfigFactory.pm
=== modified file 'mysql-test/lib/My/ConfigFactory.pm'

=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm	2009-11-03 00:45:16 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2009-11-03 13:59:20 +0000
@@ -142,8 +142,9 @@
 
 sub fix_std_data {
   my ($self, $config, $group_name, $group)= @_;
-  my $basedir= $self->get_basedir($group);
-  return "$basedir/mysql-test/std_data";
+  return my_find_dir($self->get_basedir($group),
+		     ["share/mysql-test", "mysql-test"],
+		     "std_data");
 }
 
 sub ssl_supported {


Attachment: [text/bzr-bundle] bzr/[e-mail]