diff --git a/mysql-test/include/search_pattern_in_file.inc b/mysql-test/include/search_pattern_in_file.inc

index 3280dbf..f77a7c6 100644

--- a/mysql-test/include/search_pattern_in_file.inc

+++ b/mysql-test/include/search_pattern_in_file.inc

@@ -82,8 +82,14 @@ perl;

     }

     $ENV{'SEARCH_FILE'} =~ s{^.*?([^/\\]+)$}{$1};

     if ($content =~ m{$search_pattern}) {

+      die "FOUND /$search_pattern/ in $ENV{'SEARCH_FILE'}\n"

+      if $ENV{SEARCH_ABORT} eq 'FOUND';

       print "FOUND /$search_pattern/ in $ENV{'SEARCH_FILE'}\n"

+      unless defined $ENV{SEARCH_ABORT};

     } else {

+      die "NOT FOUND /$search_pattern/ in $ENV{'SEARCH_FILE'}\n"

+      if $ENV{SEARCH_ABORT} eq 'NOT FOUND';

       print "NOT FOUND /$search_pattern/ in $ENV{'SEARCH_FILE'}\n"

+      unless defined $ENV{SEARCH_ABORT};

     }