From c5f7486654d7fd4941b202735799f9a7ec3c15eb Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Wed, 26 Mar 2014 14:13:12 -0400 Subject: bzr merge -r4062..4065 codership/5.6 --- sql/wsrep_utils.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/wsrep_utils.cc') diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index fae9d97eedd..884ba93b071 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; -- cgit v1.2.1