summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sayantan.dutta@oracle.com>2012-01-31 17:46:45 +0530
committerunknown <sayantan.dutta@oracle.com>2012-01-31 17:46:45 +0530
commit1fcca29745d7e0f69a6ff26dda12a08326a36d9a (patch)
treeca3e994372022ab9e7002b2803ed84bafa643761 /mysql-test
parentf026d4f45c55c58434a74c463914cec2b2371dc9 (diff)
parent9ac635321b80ccadcc73d6db98378f4828fc6928 (diff)
downloadmariadb-git-1fcca29745d7e0f69a6ff26dda12a08326a36d9a.tar.gz
Undo last push
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 2bcca48c5ba..2df6087f2b4 100755
--- 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|WARNING)|InnoDB: (Error|ERROR)/,
+ qr/InnoDB: Warning|InnoDB: Error/,
qr/^safe_mutex:|allocated at line/,
qr/missing DBUG_RETURN/,
qr/Attempting backtrace/,