From dbf6b9dc3ff27cba1c491b3418e282dfa864ea55 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Apr 2008 11:22:15 +0200 Subject: [PATCH] Be more prcise in which cluster_config sections should be expanded. Ie don't treat cluster_config.mysqld.1.1 as a section specifying a cluster --- mysql-test/lib/My/ConfigFactory.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 29988d0013b..05b90e24c49 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section { # Add a [mysl_cluster.] section for each # defined [cluster_config.] section - foreach my $group ( $config->like('cluster_config.') ) + foreach my $group ( $config->like('cluster_config.[0-9]') ) { 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.') ) { + foreach my $group ( $config->like('cluster_config.[0-9]') ) { # Keep track of current index per process type my %idxes; @@ -580,7 +580,7 @@ sub new_config { $self->run_section_rules($config, - 'cluster_config.', + 'cluster_config.[0-9]', @cluster_config_rules); $self->run_generate_sections_from_cluster_config($config);