mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 48795

Browse source
This commit is contained in:
Bjorn Munch 2009-11-16 15:33:08 +01:00
commit af6a53abd4
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/include/mtr_warnings.sql
View file

@ -192,7 +192,7 @@ INSERT INTO global_suppressions VALUES
("==[0-9]*== Using"),
("==[0-9]*== For more details"),
/* This comes with innodb plugin tests */
("==[0-9]*== Warning: set address range perms: large range .* .defined."),
("==[0-9]*== Warning: set address range perms: large range"),
("THE_LAST_SUPPRESSION")||

8
mysql-test/mysql-test-run.pl
View file

@ -3707,9 +3707,17 @@ sub extract_warning_lines ($$) {
qr/Attempting backtrace/,
qr/Assertion .* failed/,
);
my $skip_valgrind= 0;
foreach my $line ( @lines )
{
if ($opt_valgrind_mysqld) {
# Skip valgrind summary from tests where server has been restarted
# Should this contain memory leaks, the final report will find it
$skip_valgrind= 1 if $line =~ /^==\d+== ERROR SUMMARY:/;
$skip_valgrind= 0 unless $line =~ /^==\d+==/;
next if $skip_valgrind;
}
foreach my $pat ( @patterns )
{
if ( $line =~ /$pat/ )