summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-07 12:08:34 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-07 12:08:34 +0300
commit112d721a74c1f9dcf3321006418fd4abc2884751 (patch)
tree40fc802ff2b7e382e16e510cda2109f62bdd68b3 /mysql-test
parent7008d4616421fdf73d109ed297def27fa4679da4 (diff)
parentd861822c4f5c05dc7a0baa470212c823fc36fe4c (diff)
downloadmariadb-git-112d721a74c1f9dcf3321006418fd4abc2884751.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/search_pattern_in_file++.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/search_pattern_in_file++.inc b/mysql-test/include/search_pattern_in_file++.inc
index 3c5529989bb..21192b55efb 100644
--- a/mysql-test/include/search_pattern_in_file++.inc
+++ b/mysql-test/include/search_pattern_in_file++.inc
@@ -76,5 +76,6 @@ perl;
my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND";
$ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1};
print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n";
- exit $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
+ die "$ENV{SEARCH_ABORT}\n"
+ if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
EOF