diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-04-07 14:53:40 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@linux.ibm.com> | 2020-04-07 23:39:10 +1000 |
| commit | d848fcad69d3e3a385290b67f809a96d87f40386 (patch) | |
| tree | a0e730dcfd5f725d02f9af95f6be68d1c77a6933 | |
| parent | dcc2eaebbdf658af35a92249a565d80c19967cbe (diff) | |
| download | mariadb-git-d848fcad69d3e3a385290b67f809a96d87f40386.tar.gz | |
MDEV-22010: mtr, "mariadbd" exists in mysys error messages
Also executable can change for jemalloc.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-force-corrupt.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-force-corrupt.test | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8d7e4b87f6d..fcb8e5801e2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4672,7 +4672,7 @@ sub extract_warning_lines ($$) { my @patterns = ( - qr/^Warning|mysqld: Warning|\[Warning\]/, + qr/^Warning|(mysqld|mariadbd): Warning|\[Warning\]/, qr/^Error:|\[ERROR\]/, qr/^==\d+==\s+\S/, # valgrind errors qr/InnoDB: Warning|InnoDB: Error/, @@ -4747,7 +4747,7 @@ sub extract_warning_lines ($$) { qr|Access denied for user|, qr|Aborted connection|, qr|table.*is full|, - qr|\[ERROR\] mysqld: \Z|, # Warning from Aria recovery + qr/\[ERROR\] (mysqld|mariadbd): \Z/, # Warning from Aria recovery qr|Linux Native AIO|, # warning that aio does not work on /dev/shm qr|InnoDB: io_setup\(\) attempt|, qr|InnoDB: io_setup\(\) failed with EAGAIN|, @@ -6279,7 +6279,7 @@ sub valgrind_arguments { my $exe= shift; # Ensure the jemalloc works with mysqld - if ($$exe =~ /mysqld/) + if ($$exe =~ /(mysqld|mariadbd)/) { my %somalloc=( 'system jemalloc' => 'libjemalloc*', diff --git a/mysql-test/suite/encryption/r/innodb-force-corrupt.result b/mysql-test/suite/encryption/r/innodb-force-corrupt.result index 012901010b4..24829e5f526 100644 --- a/mysql-test/suite/encryption/r/innodb-force-corrupt.result +++ b/mysql-test/suite/encryption/r/innodb-force-corrupt.result @@ -1,7 +1,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version="); call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table"); -call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it"); +call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadb).*: Index for table 't2' is corrupt; try to repair it"); SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; # Create and populate tables to be corrupted diff --git a/mysql-test/suite/encryption/t/innodb-force-corrupt.test b/mysql-test/suite/encryption/t/innodb-force-corrupt.test index 8144f4597e2..33a41238859 100644 --- a/mysql-test/suite/encryption/t/innodb-force-corrupt.test +++ b/mysql-test/suite/encryption/t/innodb-force-corrupt.test @@ -10,7 +10,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version="); call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table"); -call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it"); +call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadb).*: Index for table 't2' is corrupt; try to repair it"); SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; |