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

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23

Browse Source 
into mysql.com:/home/mysql_src/mysql-3.23


libmysql/libmysql.c:
  Auto merged
This commit is contained in:
unknown
2004-06-17 15:41:54 +02:00
parent 3665b3be90 414250c4f2
commit b57fe1e26a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/libmysql.c
View File

@ -1354,7 +1354,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
my_gethostbyname_r_free(); my_gethostbyname_r_free();
goto error; goto error;
} }
memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); memcpy(&sock_addr.sin_addr, hp->h_addr,
min(sizeof(sock_addr.sin_addr), (size_t) hp->h_length));
my_gethostbyname_r_free(); my_gethostbyname_r_free();
} }
sock_addr.sin_port = (ushort) htons((ushort) port); sock_addr.sin_port = (ushort) htons((ushort) port);