Commit ec7e213b authored by Magnus Blåudd's avatar Magnus Blåudd

Bug#47612 mtr - improving the report for valgrind erorrs

 - Improve the report produced when a valgrind error is detected
parent f934270a
...@@ -57,5 +57,5 @@ if (`select @result = 0`){ ...@@ -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;
...@@ -207,7 +207,7 @@ BEGIN ...@@ -207,7 +207,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
......
...@@ -1307,6 +1307,9 @@ sub command_line_setup { ...@@ -1307,6 +1307,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), "\"");
} }
...@@ -3588,7 +3591,7 @@ sub extract_warning_lines ($) { ...@@ -3588,7 +3591,7 @@ sub extract_warning_lines ($) {
# qr/^Error:|\[ERROR\]/, # qr/^Error:|\[ERROR\]/,
qr/^Warning:|mysqld: Warning/, qr/^Warning:|mysqld: Warning/,
qr/^Error:/, qr/^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/,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment