From: sayantan.dutta Date: January 31 2012 12:18pm Subject: bzr push into mysql-5.5 branch (sayantan.dutta:3659 to 3660) List-Archive: http://lists.mysql.com/commits/142672 Message-Id: <201201311218.q0VCIkse029324@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3660 sayantan.dutta@stripped 2012-01-31 [merge] Undo last push modified: mysql-test/mysql-test-run.pl 3659 sayantan.dutta@stripped 2012-01-31 [merge] merge #64127 5.1 => 5.5 modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2012-01-31 11:50:56 +0000 +++ b/mysql-test/mysql-test-run.pl 2012-01-31 12:16:45 +0000 @@ -4271,7 +4271,7 @@ sub extract_warning_lines ($$) { qr/^Warning:|mysqld: Warning|\[Warning\]/, qr/^Error:|\[ERROR\]/, qr/^==\d+==\s+\S/, # valgrind errors - qr/InnoDB: (Warning|WARNING)|InnoDB: (Error|ERROR)/, + qr/InnoDB: Warning|InnoDB: Error/, qr/^safe_mutex:|allocated at line/, qr/missing DBUG_RETURN/, qr/Attempting backtrace/, No bundle (reason: useless for push emails).