diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-10-27 17:29:11 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-10-27 17:29:11 +1100 |
| commit | 21313ac3b306301909a3085796aea1bd055d8fbd (patch) | |
| tree | e24151ca980c5c9b78104eaeaecd9c1ecccb8741 | |
| parent | 2733f6e3de3e2834734c935bc1961983a2629db1 (diff) | |
| download | mariadb-git-bb-10.11-danielblack-MDEV-24377-pr2009.tar.gz | |
MDEV-24377: Fixed review nitsbb-10.11-danielblack-MDEV-24377-pr2009
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/wsrep_utils.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 637c7f676fb..2af9bf39d8a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -135,8 +135,6 @@ #define mysqld_charset &my_charset_latin1 -#define DELIM ',' - extern "C" { // Because of SCO 3.2V4.2 #include <sys/stat.h> #ifndef __GNU_LIBRARY__ @@ -2322,7 +2320,7 @@ static void activate_tcp_port(uint port, do { - end= strcend(real_bind_addr_str, DELIM); + end= strcend(real_bind_addr_str, ','); strmake(address, real_bind_addr_str, (uint) (end - real_bind_addr_str)); error= getaddrinfo(address, port_buf, &hints, &ai); diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index e9b97aa64f1..854c11c1eea 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -458,7 +458,7 @@ unsigned int wsrep_check_ip (const char* const addr, bool *is_ipv6) *is_ipv6= false; char *end; - char address[FN_REFLEN]; + char address[INET6_ADDRSTRLEN]; end= strcend(addr, ','); strmake(address, addr, (uint) (end - addr)); |