database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Magnus Blåudd
2009-10-08 10:32:43 +02:00
parent b96230c858 610778dcce
commit 7a633b68d2
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/check-warnings.test
View File

@ -57,5 +57,5 @@ if (`select @result = 0`){
skip OK; skip OK;
} }
--enable_query_log --enable_query_log
echo ^ Found warnings!!; echo ^ Found warnings in $log_error;
exit; exit;

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

@ -209,7 +209,7 @@ BEGIN
WHERE suspicious=1; WHERE suspicious=1;
IF @num_warnings > 0 THEN IF @num_warnings > 0 THEN
SELECT file_name, line SELECT line
FROM error_log WHERE suspicious=1; FROM error_log WHERE suspicious=1;
--SELECT * FROM test_suppressions; --SELECT * FROM test_suppressions;
-- Return 2 -> check failed -- Return 2 -> check failed

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

@ -1337,6 +1337,9 @@ sub command_line_setup {
push(@valgrind_args, @default_valgrind_args) push(@valgrind_args, @default_valgrind_args)
unless @valgrind_args; unless @valgrind_args;
# Make valgrind run in quiet mode so it only print errors
push(@valgrind_args, "--quiet" );
mtr_report("Running valgrind with options \"", mtr_report("Running valgrind with options \"",
join(" ", @valgrind_args), "\""); join(" ", @valgrind_args), "\"");
} }
@ -3652,7 +3655,7 @@ sub extract_warning_lines ($$) {
# of patterns. For more info see BUG#42408 # of patterns. For more info see BUG#42408
qr/^Warning:|mysqld: Warning|\[Warning\]/, qr/^Warning:|mysqld: Warning|\[Warning\]/,
qr/^Error:|\[ERROR\]/, qr/^Error:|\[ERROR\]/,
qr/^==.* at 0x/, qr/^==\d*==/, # valgrind errors
qr/InnoDB: Warning|InnoDB: Error/, qr/InnoDB: Warning|InnoDB: Error/,
qr/^safe_mutex:|allocated at line/, qr/^safe_mutex:|allocated at line/,
qr/missing DBUG_RETURN/, qr/missing DBUG_RETURN/,