diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
| commit | 6286a05d80f9911b7cd6ba57b04a6f67d39e499d (patch) | |
| tree | 97a8a27c2d99a4474181e32602414d94944bfd80 /sql/wsrep_mysqld.cc | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| parent | 3c92050d1c907cc548e848d0ab2891a06681ad92 (diff) | |
| download | mariadb-git-6286a05d80f9911b7cd6ba57b04a6f67d39e499d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index c20ebead8d6..e52613492f0 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -709,11 +709,14 @@ static std::string wsrep_server_incoming_address() /* In case port is not specified in wsrep_node_incoming_address, we use mysqld_port. + Note that we might get here before we execute set_ports(). */ - int port= (addr.get_port() > 0) ? addr.get_port() : (int) mysqld_port; + int local_port= (addr.get_port() > 0) ? addr.get_port() : (int) mysqld_port; + if (!local_port) + local_port= MYSQL_PORT; const char *fmt= (addr.is_ipv6()) ? "[%s]:%u" : "%s:%u"; - snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), port); + snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), local_port); } done: |