database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix compile errors

Browse Source
This commit is contained in:
Vladislav Vaintroub
2017-08-23 08:27:46 +00:00
parent 58cd69fc80
commit aaddac5cd7
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extra/mariabackup/CMakeLists.txt
View File

@ -73,7 +73,6 @@ MYSQL_ADD_EXECUTABLE(mariabackup
backup_mysql.cc backup_mysql.cc
backup_copy.cc backup_copy.cc
encryption_plugin.cc encryption_plugin.cc
${PROJECT_SOURCE_DIR}/sql/net_serv.cc
${NT_SERVICE_SOURCE} ${NT_SERVICE_SOURCE}
${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c
COMPONENT backup COMPONENT backup

4
sql/proxy_protocol.cc
View File

@ -53,8 +53,8 @@ static int parse_v1_header(char *hdr, size_t len, proxy_peer_info *peer_info)
return -1; return -1;
} }
if (client_port < 0 || client_port > UINT16_MAX if (client_port < 0 || client_port > 0xffff
|| server_port < 0 || server_port > UINT16_MAX) || server_port < 0 || server_port > 0xffff)
return -1; return -1;
if (!strcmp(address_family, "UNKNOWN")) if (!strcmp(address_family, "UNKNOWN"))

2
tests/mysql_client_test.c
View File

@ -19679,7 +19679,7 @@ static void test_proxy_header_tcp(const char *ipaddr, int port)
int i; int i;
// normalize IPv4-mapped IPv6 addresses, e.g ::ffff:192.168.0.1 to 192.168.0.1 // 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)); 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); sprintf(text_header,"PROXY %s %s %s %d 3306\r\n",family == AF_INET?"TCP4":"TCP6", ipaddr, ipaddr, port);