From c5f7486654d7fd4941b202735799f9a7ec3c15eb Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Wed, 26 Mar 2014 14:13:12 -0400
Subject: [PATCH] bzr merge -r4062..4065 codership/5.6

---
 sql/slave.cc        | 1 +
 sql/wsrep_mysqld.cc | 2 --
 sql/wsrep_utils.cc  | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index 0dcaec838da84..7fa00b7425aa2 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4628,6 +4628,7 @@ log '%s' at position %s, relay log '%s' position: %s%s", RPL_LOG_NAME,
     }
   }
 #endif /* WITH_WSREP */
+
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
 #ifdef HAVE_OPENSSL
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 35629b1fbf629..59a5d916ee141 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -481,8 +481,6 @@ static void wsrep_init_position()
   }
 }
 
-extern char* my_bind_addr_str;
-
 int wsrep_init()
 {
   int rcode= -1;
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc
index fae9d97eeddc6..884ba93b07181 100644
--- a/sql/wsrep_utils.cc
+++ b/sql/wsrep_utils.cc
@@ -321,6 +321,8 @@ thd::~thd ()
 /* Returns INADDR_NONE, INADDR_ANY, INADDR_LOOPBACK or something else */
 unsigned int wsrep_check_ip (const char* const addr)
 {
+  if (addr && 0 == strcasecmp(addr, MY_BIND_ALL_ADDRESSES)) return INADDR_ANY;
+
   unsigned int ret = INADDR_NONE;
   struct addrinfo *res, hints;
 
@@ -361,9 +363,6 @@ unsigned int wsrep_check_ip (const char* const addr)
   return ret;
 }
 
-extern char* my_bind_addr_str;
-extern uint        mysqld_port;
-
 size_t wsrep_guess_ip (char* buf, size_t buf_len)
 {
   size_t ip_len = 0;