diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-04 20:49:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 00:20:17 +0200 |
| commit | ffb38c9771bc7248482dc6a3d2f26ca10fe09a9b (patch) | |
| tree | 0ed205d4ec048ddbeb129f3a8f09fbe3dd316c06 /mysql-test/include/search_pattern_in_file.inc | |
| parent | 719321e78e69249e796a907c17400dac14ef0921 (diff) | |
| download | mariadb-git-ffb38c9771bc7248482dc6a3d2f26ca10fe09a9b.tar.gz | |
MDEV-8139 Fix scrubbing testsbb-10.1-mdev-8139
encryption.innodb_scrub: Clean up. Make it also cover ROW_FORMAT=COMPRESSED,
removing the need for encryption.innodb_scrub_compressed.
Add a FIXME comment saying that we should create a secondary index, to
demonstrate that also undo log pages get scrubbed. Currently that is
not working!
Also clean up encryption.innodb_scrub_background, but keep it disabled,
because the background scrubbing does not work reliably.
Fix both tests so that if something is not scrubbed, the test will be
aborted, so that the data files will be preserved. Allow the tests to
run on Windows as well.
Diffstat (limited to 'mysql-test/include/search_pattern_in_file.inc')
| -rw-r--r-- | mysql-test/include/search_pattern_in_file.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/include/search_pattern_in_file.inc b/mysql-test/include/search_pattern_in_file.inc index 3280dbfd574..f77a7c60916 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}; } EOF |