mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl

Browse source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/lib/mtr_cases.pm:
  Auto merged
This commit is contained in:
unknown 2008-04-25 14:39:24 +02:00
commit ec19196c30
7 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/lib/My/ConfigFactory.pm
View file

@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section {
# Add a [mysl_cluster.<suffix>] section for each
# defined [cluster_config.<suffix>] section
foreach my $group ( $config->like('cluster_config.[0-9]') )
foreach my $group ( $config->like('cluster_config\.\w*') )
{
my @urls;
# Generate ndb_connectstring for this cluster
@ -497,7 +497,7 @@ sub run_generate_sections_from_cluster_config {
my @options= ('ndb_mgmd', 'ndbd',
'mysqld', 'ndbapi');
foreach my $group ( $config->like('cluster_config.[0-9]') ) {
foreach my $group ( $config->like('cluster_config\.\w*') ) {
# Keep track of current index per process type
my %idxes;
@ -580,7 +580,7 @@ sub new_config {
$self->run_section_rules($config,
'cluster_config.[0-9]',
'cluster_config\.\w*',
@cluster_config_rules);
$self->run_generate_sections_from_cluster_config($config);

9
mysql-test/lib/mtr_cases.pm
View file

@ -722,6 +722,15 @@ sub collect_one_test_case {
# ----------------------------------------------------------------------
process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
# ----------------------------------------------------------------------
# Check for test specific config file
# ----------------------------------------------------------------------
my $test_cnf_file= "$testdir/$tname.cnf";
if ( -f $test_cnf_file ) {
# Specifies the configuration file to use for this test
$tinfo->{'template_path'}= $test_cnf_file;
}
# ----------------------------------------------------------------------
# master sh
# ----------------------------------------------------------------------