diff options
| author | Monty <monty@mariadb.org> | 2018-11-21 19:24:43 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-12-09 20:49:05 +0200 |
| commit | fa8d7f367522146eb18964ba5503f839f5702e8f (patch) | |
| tree | 7876f7b9c762566fc81fcd374c1f0b539c885d41 /mysql-test/lib | |
| parent | c82855d88272f0a1b95d0ad2b7abf804aeff8145 (diff) | |
| download | mariadb-git-fa8d7f367522146eb18964ba5503f839f5702e8f.tar.gz | |
Fixed that mtr --extern works with --include/have_innodb.inc
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 61ce88f9a5a..3fe57987713 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -291,6 +291,7 @@ sub combinations_from_file($$) @combs = ({ skip => $skip_combinations{$filename} }); } else { return () if @::opt_combinations or not -f $filename; + return () if ::using_extern(); # Read combinations file in my.cnf format mtr_verbose("Read combinations file $filename"); my $config= My::Config->new($filename); |