database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge 48795

Browse Source
This commit is contained in:
Bjorn Munch
2009-11-16 15:33:08 +01:00
parent 1250b56613 9053565e7b
commit af6a53abd4
2 changed files with 9 additions and 1 deletions
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]*== Using"),
("==[0-9]*== For more details"), ("==[0-9]*== For more details"),
/* This comes with innodb plugin tests */ /* 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")|| ("THE_LAST_SUPPRESSION")||

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

@ -3707,9 +3707,17 @@ sub extract_warning_lines ($$) {
qr/Attempting backtrace/, qr/Attempting backtrace/,
qr/Assertion .* failed/, qr/Assertion .* failed/,
); );
my $skip_valgrind= 0;
foreach my $line ( @lines ) 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 ) foreach my $pat ( @patterns )
{ {
if ( $line =~ /$pat/ ) if ( $line =~ /$pat/ )