summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-09-27 19:20:43 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-09-27 19:20:43 -0400
commitbca5894d519fc1aa1d2619257ee772060eeaf36a (patch)
treefb31f6bfdcdd86ebaf42469a5050e7d90c10d4fa
parent6927459e5b61a6ca88245872cc3c2c5daa30dddf (diff)
downloadmariadb-git-bca5894d519fc1aa1d2619257ee772060eeaf36a.tar.gz
Adjust warning suppression over a recent change in galera library.
-rw-r--r--mysql-test/suite/galera/suite.pm3
-rw-r--r--mysql-test/suite/wsrep/suite.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 28163d62ef1..c44aece09e3 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -25,7 +25,8 @@ return "No my_print_defaults" unless $epath;
push @::global_suppressions,
(
qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1),
- qr(WSREP: Could not open saved state file for reading: ),
+ qr(WSREP: Could not open saved state file for reading: .*),
+ qr(WSREP: Could not open state file for reading: .*),
qr(WSREP: Gap in state sequence. Need state transfer.),
qr(WSREP: Failed to prepare for incremental state transfer:),
qr(WSREP:.*down context.*),
diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm
index ec7a3e374f5..a7939c2e333 100644
--- a/mysql-test/suite/wsrep/suite.pm
+++ b/mysql-test/suite/wsrep/suite.pm
@@ -24,7 +24,8 @@ return "No my_print_defaults" unless $epath;
push @::global_suppressions,
(
- qr(WSREP: Could not open saved state file for reading: ),
+ qr(WSREP: Could not open saved state file for reading: .*),
+ qr(WSREP: Could not open state file for reading: .*),
qr(WSREP: option --wsrep-causal-reads is deprecated),
qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0),
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,