From 5079d69d48e2c1b763d23bdb294297e6d6da43a2 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Thu, 5 Nov 2015 21:52:19 -0500
Subject: [PATCH] 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).
---
 sql/wsrep_utils.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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.