bzr commit into mysql-5.5-trunk-bugfixing branch (jperkin:2906) Bug#46834

[Jonathan Perkin]

#At file:///home/sketch/bzr/mysql-trunk-bugfixing/ based on revid:alik@stripped

 2906 Jonathan Perkin	2009-11-03
      Additional change required for bug#46834, find the std_data directory
      correctly in RPMs.

    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-06-22 14:27:05 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2009-11-03 13:56:35 +0000
@@ -141,8 +141,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]