diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:38 +0200 |
| commit | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (patch) | |
| tree | e07ada7fbde72c438f2a6a6c162e050caf1950f9 /mysql-test/lib | |
| parent | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-37ab7e45963627f3c1ea2dd43d5b305de37bb16f.tar.gz | |
Merge branch '5.5' into 10.0
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(); } |