Auto-merge from mysql-trunk-bugfixing.

.bzr-mysql/default.conf

 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.5-next-mr"
+tree_name = "mysql-5.5-trunk"

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 "$basedir/mysql-test/std_data";
+  return my_find_dir($self->get_basedir($group),
+		     ["share/mysql-test", "mysql-test"],
+		     "std_data");
 }
 
 sub ssl_supported {