diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:30:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:30:56 +0300 |
| commit | ae02407ce3a8fa17949383f9156101c9b464d586 (patch) | |
| tree | a3f63df2a3186832faca5f470f4033d8099e9666 /mysql-test/include | |
| parent | 8c0d873b76d2fe9651c1da8084b5ace0ff04b419 (diff) | |
| parent | a82ed92a6a721f45f23e210c132d5b33d3dccd21 (diff) | |
| download | mariadb-git-ae02407ce3a8fa17949383f9156101c9b464d586.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/search_pattern_in_file.inc | 3 |
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 |