diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 13:02:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 15:10:01 +0100 |
| commit | 44f6f445933e12cbc4cce63e2b7d983b9938d3b9 (patch) | |
| tree | f5230fb24510bb201eb33122a62939ce74588b83 /mysql-test/lib | |
| parent | 8772824ce72a811ea92dd5cfb73602eb93237891 (diff) | |
| parent | f4b8b6b9a3ad4ce5e5218e2ec2dfe6dd34112e45 (diff) | |
| download | mariadb-git-44f6f445933e12cbc4cce63e2b7d983b9938d3b9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/Config.pm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm index a343a0ef688..4af59a178de 100644 --- a/mysql-test/lib/My/Config.pm +++ b/mysql-test/lib/My/Config.pm @@ -195,14 +195,10 @@ sub value { my ($self, $option_name)= @_; my $option= $self->option($option_name); - if (! defined($option) and defined $ENV{$option_name}) { + if (! defined($option)) { my $value= $ENV{$option_name}; $option= My::Config::Option->new($option_name, $value); } - - croak "No option named '$option_name' in group '$self->{name}'" - if ! defined($option); - return $option->value(); } |