summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-03-28 08:26:08 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-03-28 08:26:08 -0400
commit9d2e90f379654fb65c0eab006213d772302bcff7 (patch)
treea9d4a9340cf301c180df704fa4c667840038bfc9 /mysql-test/mysql-test-run.pl
parent02ba2bfdb444531e6fe61716a4eaeab40e210bbd (diff)
parenta500865c133251416604255028802b550d6941a8 (diff)
downloadmariadb-git-9d2e90f379654fb65c0eab006213d772302bcff7.tar.gz
Merged revision 3471, 3472 & 3473 from maria-5.5-galera.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 689320f7cd4..03c9d00df87 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4832,6 +4832,9 @@ sub extract_warning_lines ($$) {
qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|,
qr|'log-bin-use-v1-row-events' is MySQL 5.6 compatible option|,
qr|InnoDB: Setting thread \d+ nice to \d+ failed, current nice \d+, errno 13|, # setpriority() fails under valgrind
+ # Galera-related warnings.
+ qr|WSREP:.*down context.*|,
+ qr|WSREP: Failed to send state UUID:.*|,
);
my $matched_lines= [];