merge #64127 5.1 => 5.5

f026d4f4 · unknown · 6a6bb446 · 2e4ae477 · f026d4f4
Commit f026d4f4 authored Jan 31, 2012 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +1 -1

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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|InnoDB: Error/,
+     qr/InnoDB: (Warning|WARNING)|InnoDB: (Error|ERROR)/,
     qr/^safe_mutex:|allocated at line/,
     qr/missing DBUG_RETURN/,
     qr/Attempting backtrace/,