diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 20:51:39 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 20:51:39 -0400 |
| commit | fa5f18d6734249aa326d6296c9b9c2338cb33b10 (patch) | |
| tree | 63233fb5a049d4683cc6faa910875702a7836d8c /sql/wsrep_mysqld.cc | |
| parent | f533b2b462b5b73630245172b627506d36f95b39 (diff) | |
| parent | 37ae601a8766f37cdd919efc801133d2a8cfaf70 (diff) | |
| download | mariadb-git-fa5f18d6734249aa326d6296c9b9c2338cb33b10.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index cc8a6b64526..548db8245c3 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -777,19 +777,10 @@ bool wsrep_start_replication() wsrep_sst_donor, bootstrap))) { - if (-ESOCKTNOSUPPORT == rcode) - { - DBUG_PRINT("wsrep",("unrecognized cluster address: '%s', rcode: %d", - wsrep_cluster_address, rcode)); - WSREP_ERROR("unrecognized cluster address: '%s', rcode: %d", - wsrep_cluster_address, rcode); - } - else - { - DBUG_PRINT("wsrep",("wsrep->connect() failed: %d", rcode)); - WSREP_ERROR("wsrep::connect() failed: %d", rcode); - } - + DBUG_PRINT("wsrep",("wsrep->connect(%s) failed: %d", + wsrep_cluster_address, rcode)); + WSREP_ERROR("wsrep::connect(%s) failed: %d", + wsrep_cluster_address, rcode); return false; } else |