From fa8d7f367522146eb18964ba5503f839f5702e8f Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 21 Nov 2018 19:24:43 +0200
Subject: Fixed that mtr --extern works with --include/have_innodb.inc

---
 mysql-test/lib/mtr_cases.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mysql-test/lib')

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);
-- 
cgit v1.2.1