Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ec7e213b
Commit
ec7e213b
authored
Sep 24, 2009
by
Magnus Blåudd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#47612 mtr - improving the report for valgrind erorrs
- Improve the report produced when a valgrind error is detected
parent
f934270a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
mysql-test/include/check-warnings.test
mysql-test/include/check-warnings.test
+1
-1
mysql-test/include/mtr_warnings.sql
mysql-test/include/mtr_warnings.sql
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+4
-1
No files found.
mysql-test/include/check-warnings.test
View file @
ec7e213b
...
@@ -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
;
mysql-test/include/mtr_warnings.sql
View file @
ec7e213b
...
@@ -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
...
...
mysql-test/mysql-test-run.pl
View file @
ec7e213b
...
@@ -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/
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment