diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index febc9b48fa70d08734f9008b4b868f093e7be136..03be110f59dd880ecd6afbe68292e4b5e0c69465 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -358,7 +358,7 @@ sub post_check_client_group { if (! defined $option){ #print $config; - croak "Could not get value for '$name_from'"; + croak "Could not get value for '$name_from' for test $self->{testname}"; } $config->insert($client_group_name, $name_to, $option->value()) } @@ -446,7 +446,7 @@ sub resolve_at_variable { my $from_group= $config->group($group_name) or croak "There is no group named '$group_name' that ", - "can be used to resolve '$option_name'"; + "can be used to resolve '$option_name' for test '$self->{testname}'"; my $from= $from_group->value($option_name); $config->insert($group->name(), $option->name(), $from) @@ -623,6 +623,7 @@ sub new_config { HOSTS => $hosts, NEXT_HOST => 0, SERVER_ID => 1, + testname => $args->{testname}, }, $class; # add auto-options diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 87526117874cd400a6f81d147f8659d4e9a76fde..c907b5c4de5db7bcc4bb46399adc9642b13a526f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3826,6 +3826,7 @@ sub run_testcase ($$) { # Generate new config file from template $config= My::ConfigFactory->new_config ( { + testname => $tinfo->{name}, basedir => $basedir, testdir => $glob_mysql_test_dir, template_path => $tinfo->{template_path}, diff --git a/mysql-test/suite/rpl/t/rpl_test_framework.cnf b/mysql-test/suite/rpl/t/rpl_test_framework.cnf index 8934d1c9ae1d9d13e934957049929aa7961ea93f..8a34e5b060d1529cb66ed8cb9428113014a69b89 100644 --- a/mysql-test/suite/rpl/t/rpl_test_framework.cnf +++ b/mysql-test/suite/rpl/t/rpl_test_framework.cnf @@ -17,18 +17,18 @@ log-slave-updates log-slave-updates [mysqld.9] log-slave-updates -#[mysqld.10] -#log-slave-updates -#[mysqld.11] -#log-slave-updates -#[mysqld.12] -#log-slave-updates -#[mysqld.13] -#log-slave-updates -#[mysqld.14] -#log-slave-updates -#[mysqld.15] -#log-slave-updates +# [mysqld.10] +# log-slave-updates +# [mysqld.11] +# log-slave-updates +# [mysqld.12] +# log-slave-updates +# [mysqld.13] +# log-slave-updates +# [mysqld.14] +# log-slave-updates +# [mysqld.15] +# log-slave-updates [ENV] SERVER_MYPORT_3= @mysqld.3.port @@ -38,9 +38,9 @@ SERVER_MYPORT_6= @mysqld.6.port SERVER_MYPORT_7= @mysqld.7.port SERVER_MYPORT_8= @mysqld.8.port SERVER_MYPORT_9= @mysqld.9.port -#SERVER_MYPORT_10= @mysqld.10.port -#SERVER_MYPORT_11= @mysqld.11.port -#SERVER_MYPORT_12= @mysqld.12.port -#SERVER_MYPORT_13= @mysqld.13.port -#SERVER_MYPORT_14= @mysqld.14.port -#SERVER_MYPORT_15= @mysqld.15.port +# SERVER_MYPORT_10= @mysqld.10.port +# SERVER_MYPORT_11= @mysqld.11.port +# SERVER_MYPORT_12= @mysqld.12.port +# SERVER_MYPORT_13= @mysqld.13.port +# SERVER_MYPORT_14= @mysqld.14.port +# SERVER_MYPORT_15= @mysqld.15.port