diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
| commit | 02ba2bfdb444531e6fe61716a4eaeab40e210bbd (patch) | |
| tree | 0b67ad5b8f6e8a901ed2b6cac8d4692d8db8f112 /sql/wsrep_utils.cc | |
| parent | 09e3094945694277a550cccc8bd1fd11338474b1 (diff) | |
| parent | c5f7486654d7fd4941b202735799f9a7ec3c15eb (diff) | |
| download | mariadb-git-02ba2bfdb444531e6fe61716a4eaeab40e210bbd.tar.gz | |
Merging revision from codership-mysql/5.5 (r3928..3968) and
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
Diffstat (limited to 'sql/wsrep_utils.cc')
| -rw-r--r-- | sql/wsrep_utils.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index fae9d97eedd..cdee1c2cece 100644 --- a/sql/wsrep_utils.cc +++ b/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) { |