diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-05 21:52:19 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-05 21:52:19 -0500 |
| commit | 5079d69d48e2c1b763d23bdb294297e6d6da43a2 (patch) | |
| tree | 7c97d0742fb262e22df83a33149bae8ca29fc64f /sql/wsrep_utils.cc | |
| parent | 25f8738112b05f33cfa45eabfebf6edfc80e6d8a (diff) | |
| download | mariadb-git-5079d69d48e2c1b763d23bdb294297e6d6da43a2.tar.gz | |
MDEV-8975: 10.1 Fails To Join Existing Galera Cluster
During the process of guessing the IP address, if bind-address
is INADDR_ANY, mysqld should proceed with address specified via
wsrep_node_address or use one from network interfaces.
Patch contributed by darkain (pull#115).
Diffstat (limited to 'sql/wsrep_utils.cc')
| -rw-r--r-- | sql/wsrep_utils.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index 80f8bd4c7d4..2998a5b04ac 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -410,11 +410,12 @@ size_t wsrep_guess_ip (char* buf, size_t buf_len) WSREP_ERROR("Networking not configured, cannot receive state " "transfer."); ret= 0; + goto done; } else if (INADDR_ANY != ip_type) { strncpy (buf, my_bind_addr_str, buf_len); ret= strlen(buf); + goto done; } - goto done; } // Attempt 2: mysqld binds to all interfaces, try IP from wsrep_node_address. |