bzr commit into mysql-5.1 branch (magnus.blaudd:3022) Bug#47612

[Magnus Blåudd]

#At file:///home/msvensson/mysql/bug47612/ based on revid:joro@strippedhzoand

 3022 Magnus Blåudd	2009-09-24
      Bug#47612 mtr - improving the report for valgrind erorrs
       - Improve the report produced when a valgrind error is detected

    modified:
      mysql-test/include/check-warnings.test
      mysql-test/include/mtr_warnings.sql
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/include/check-warnings.test'
--- a/mysql-test/include/check-warnings.test	2009-03-02 12:48:35 +0000
+++ b/mysql-test/include/check-warnings.test	2009-09-24 14:09:11 +0000
@@ -57,5 +57,5 @@ if (`select @result = 0`){
   skip OK;
 }
 --enable_query_log
-echo ^ Found warnings!!;
+echo ^ Found warnings in $log_error!!;
 exit;

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2009-07-10 11:35:53 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2009-09-24 14:09:11 +0000
@@ -207,7 +207,7 @@ BEGIN
     WHERE suspicious=1;
 
   IF @num_warnings > 0 THEN
-    SELECT file_name, line
+    SELECT line
         FROM error_log WHERE suspicious=1;
     --SELECT * FROM test_suppressions;
     -- Return 2 -> check failed

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-06-03 10:46:04 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-09-24 14:09:11 +0000
@@ -1307,6 +1307,9 @@ sub command_line_setup {
     push(@valgrind_args, @default_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 \"",
 	       join(" ", @valgrind_args), "\"");
   }
@@ -3588,7 +3591,7 @@ sub extract_warning_lines ($) {
      # qr/^Error:|\[ERROR\]/,
      qr/^Warning:|mysqld: Warning/,
      qr/^Error:/,
-     qr/^==.* at 0x/,
+     qr/^==\d*==/, # valgrind errors
      qr/InnoDB: Warning|InnoDB: Error/,
      qr/^safe_mutex:|allocated at line/,
      qr/missing DBUG_RETURN/,

Attachment: [text/bzr-bundle] bzr/[e-mail]