1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bzr merge -r4062..4065 codership/5.6

Browse Source
This commit is contained in:
Nirbhay Choubey 2014-03-26 14:13:12 -04:00
parent b5871a51e9
commit c5f7486654
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/slave.cc
View File

@ -4628,6 +4628,7 @@ err_during_init:
} }
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL

2
sql/wsrep_mysqld.cc
View File

@ -481,8 +481,6 @@ static void wsrep_init_position()
} }
} }
extern char* my_bind_addr_str;
int wsrep_init() int wsrep_init()
{ {
int rcode= -1; int rcode= -1;

5
sql/wsrep_utils.cc
View File

@ -321,6 +321,8 @@ thd::~thd ()
/* Returns INADDR_NONE, INADDR_ANY, INADDR_LOOPBACK or something else */ /* Returns INADDR_NONE, INADDR_ANY, INADDR_LOOPBACK or something else */
unsigned int wsrep_check_ip (const char* const addr) 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; unsigned int ret = INADDR_NONE;
struct addrinfo *res, hints; struct addrinfo *res, hints;
@ -361,9 +363,6 @@ unsigned int wsrep_check_ip (const char* const addr)
return ret; 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 wsrep_guess_ip (char* buf, size_t buf_len)
{ {
size_t ip_len = 0; size_t ip_len = 0;