database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-parts

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
This commit is contained in:
unknown
2008-01-10 17:17:04 +01:00
parent 3435acd71e c6a1ed022c
commit 0a69b0b833
21 changed files with 6186 additions and 6172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/mtr_cases.pm
View File

@ -894,8 +894,19 @@ sub collect_one_test_case {
my $config= "$suitedir/my.cnf";
if (! -f $config )
{
# Suite has no config, use default.cnf
# assume default.cnf will be used
$config= "include/default_my.cnf";
# Suite has no config, autodetect which one to use
if ( $tinfo->{rpl_test} ){
$config= "suite/rpl/my.cnf";
if ( $tinfo->{ndb_test} ){
$config= "suite/rpl_ndb/my.cnf";
}
}
elsif ( $tinfo->{ndb_test} ){
$config= "suite/ndb/my.cnf";
}
}
$tinfo->{template_path}= $config;
}