diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2009-11-12 05:20:39 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2009-11-12 05:20:39 +0300 |
| commit | 03baeb7653400750668d6a7fd86af08036d4f20d (patch) | |
| tree | 3cbd8264c83a72b1518e4d371d075b2e702155f4 | |
| parent | e99e45363395007ed0100f46316e84ca5427a337 (diff) | |
| parent | 819a2992356d0e2def8a4f864c1b725c7ef7a3dc (diff) | |
| download | mariadb-git-03baeb7653400750668d6a7fd86af08036d4f20d.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
| -rw-r--r-- | .bzr-mysql/default.conf | 2 | ||||
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index e9ae26ca793..f33ccdf6753 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [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" diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index cc3444d7a3a..916dc055c19 100644 --- 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 "$basedir/mysql-test/std_data"; + return my_find_dir($self->get_basedir($group), + ["share/mysql-test", "mysql-test"], + "std_data"); } sub ssl_supported { |