diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 04:53:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 04:53:57 +0200 |
| commit | 5ac71d4464f556f26c81172cb0fef679389beda8 (patch) | |
| tree | 5ea8b9104fb257ac546337a603dfc1beb8192ad6 /mysql-test | |
| parent | 8e15768731c52b6bbb29d7bfe27bdd71c025a3a3 (diff) | |
| parent | 5fc1ba604e27b7d9eaa2977ef5b0c180f6f62565 (diff) | |
| download | mariadb-git-5ac71d4464f556f26c81172cb0fef679389beda8.tar.gz | |
Merge remote-tracking branch '10.0-galera' into 10.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_var_cluster_address.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/suite.pm | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_var_cluster_address.test | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_var_cluster_address.result b/mysql-test/suite/galera/r/galera_var_cluster_address.result index 55d216eda00..17b5a7bca37 100644 --- a/mysql-test/suite/galera/r/galera_var_cluster_address.result +++ b/mysql-test/suite/galera/r/galera_var_cluster_address.result @@ -36,3 +36,4 @@ CALL mtr.add_suppression("failed to open gcomm backend connection: 110: failed t CALL mtr.add_suppression("Failed to open backend connection: -110 \\(Connection timed out\\)"); CALL mtr.add_suppression("gcs connect failed: Connection timed out"); CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7"); +# End of test diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 2da2b3ad503..151e7b7cbe9 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -67,6 +67,7 @@ push @::global_suppressions, qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|, qr(WSREP: Action message in non-primary configuration from member [0-9]*), + qr(WSREP: discarding established .*), ); diff --git a/mysql-test/suite/galera/t/galera_var_cluster_address.test b/mysql-test/suite/galera/t/galera_var_cluster_address.test index 4e5d138ae0a..740c38765f6 100644 --- a/mysql-test/suite/galera/t/galera_var_cluster_address.test +++ b/mysql-test/suite/galera/t/galera_var_cluster_address.test @@ -9,6 +9,7 @@ --let $node_1=node_1 --let $node_2=node_2 --source include/auto_increment_offset_save.inc + # # Set to invalid value # @@ -73,3 +74,4 @@ CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7"); --source include/auto_increment_offset_restore.inc --source include/galera_end.inc +--echo # End of test |