diff options
| -rw-r--r-- | extra/mariabackup/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sql/proxy_protocol.cc | 4 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index 78188d2f8e8..8aadf2ffe3a 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -73,7 +73,6 @@ MYSQL_ADD_EXECUTABLE(mariabackup backup_mysql.cc backup_copy.cc encryption_plugin.cc - ${PROJECT_SOURCE_DIR}/sql/net_serv.cc ${NT_SERVICE_SOURCE} ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c COMPONENT backup diff --git a/sql/proxy_protocol.cc b/sql/proxy_protocol.cc index 616e5397ea1..0309cf42ddf 100644 --- a/sql/proxy_protocol.cc +++ b/sql/proxy_protocol.cc @@ -53,8 +53,8 @@ static int parse_v1_header(char *hdr, size_t len, proxy_peer_info *peer_info) return -1; } - if (client_port < 0 || client_port > UINT16_MAX - || server_port < 0 || server_port > UINT16_MAX) + if (client_port < 0 || client_port > 0xffff + || server_port < 0 || server_port > 0xffff) return -1; if (!strcmp(address_family, "UNKNOWN")) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index c3b932addec..03aaebaddbc 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -19679,7 +19679,7 @@ static void test_proxy_header_tcp(const char *ipaddr, int port) int i; // normalize IPv4-mapped IPv6 addresses, e.g ::ffff:192.168.0.1 to 192.168.0.1 - char *normalized_addr= strncmp(ipaddr, "::ffff:", 7)?ipaddr : ipaddr + 7; + const char *normalized_addr= strncmp(ipaddr, "::ffff:", 7)?ipaddr : ipaddr + 7; memset(&v2_header, 0, sizeof(v2_header)); sprintf(text_header,"PROXY %s %s %s %d 3306\r\n",family == AF_INET?"TCP4":"TCP6", ipaddr, ipaddr, port); |