Merging revision from codership-mysql/5.5 (r3928..3968) and

codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.

sql/wsrep_utils.cc

@@ -321,6 +321,10 @@ thd::~thd ()
 /* Returns INADDR_NONE, INADDR_ANY, INADDR_LOOPBACK or something else */
 unsigned int wsrep_check_ip (const char* const addr)
 {
+#if 0
+  if (addr && 0 == strcasecmp(addr, MY_BIND_ALL_ADDRESSES)) return INADDR_ANY;
+#endif
+
   unsigned int ret = INADDR_NONE;
   struct addrinfo *res, hints;
 
@@ -362,7 +366,6 @@ unsigned int wsrep_check_ip (const char* const addr)
 }
 
 extern char* my_bind_addr_str;
-extern uint        mysqld_port;
 
 size_t wsrep_guess_ip (char* buf, size_t buf_len)
 {