database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

merge 5.2

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-03-10 09:39:14 +01:00
parent d4a3a7b90e ce675406ca
commit 41d432462b
1622 changed files with 25887 additions and 41148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,6 @@ sub fix_secure_file_priv {
sub fix_std_data {
my ($self, $config, $group_name, $group)= @_;
#return "$::opt_vardir/std_data";
my $testdir= $self->get_testdir($group);
return "$testdir/std_data";
}
@ -364,7 +363,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())
}
@ -450,9 +449,9 @@ sub resolve_at_variable {
$after = $';
chop($group_name);
my $from_group= $config->group($group_name)
or croak "There is no group named '$group_name' that ",
"can be used to resolve '$option_name'";
my $from_group= $config->group($group_name)
or croak "There is no group named '$group_name' that ",
"can be used to resolve '$option_name' for test '$self->{testname}'";
my $value= $from_group->value($option_name);
$res .= $before.$value;
@ -620,6 +619,7 @@ sub new_config {
ARGS => $args,
PORT => $args->{baseport},
SERVER_ID => 1,
testname => $args->{testname},
}, $class;
# add auto-options