1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto-merge from mysql-trunk-bugfixing.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-11-12 05:20:39 +03:00
commit 732597b54e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bzr-mysql/default.conf
View File

@ -1,4 +1,4 @@
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_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"

5
mysql-test/lib/My/ConfigFactory.pm
View File

@ -142,8 +142,9 @@ sub fix_secure_file_priv {
sub fix_std_data { sub fix_std_data {
my ($self, $config, $group_name, $group)= @_; 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 { sub ssl_supported {