Commit b57fe1e2 authored by unknown's avatar unknown
Browse files

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

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


libmysql/libmysql.c:
  Auto merged
parents 3665b3be 414250c4

libmysql/libmysql.c

+2 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 
	my_gethostbyname_r_free();

	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();

    }

    sock_addr.sin_port = (ushort) htons((ushort) port);