bzr push into mysql-5.1 branch (sayantan.dutta:3675 to 3676) Bug#64127

[sayantan.dutta]

 3676 sayantan.dutta@stripped	2012-01-31
      Bug #64127: MTR --warnings option misses some of InnoDB errors and warnings

    modified:
      mysql-test/mysql-test-run.pl
 3675 Ramil Kalimullin	2012-01-31 [merge]
      Null-merge from mysql-5.0.

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-09-19 14:06:35 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-01-31 11:39:32 +0000
@@ -3932,7 +3932,7 @@ sub extract_warning_lines ($$) {
      qr/^Warning:|mysqld: Warning|\[Warning\]/,
      qr/^Error:|\[ERROR\]/,
      qr/^==\d+==\s+\S/, # valgrind errors
-     qr/InnoDB: Warning|InnoDB: Error/,
+     qr/InnoDB: (Warning|WARNING)|InnoDB: (Error|ERROR)/,
      qr/^safe_mutex:|allocated at line/,
      qr/missing DBUG_RETURN/,
      qr/Attempting backtrace/,

No bundle (reason: useless for push emails).