diff options
| author | monty@hundin.mysql.fi <> | 2002-05-16 18:20:49 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-05-16 18:20:49 +0300 |
| commit | f5ed8784a24f12262bd01be3df63d5c891adf306 (patch) | |
| tree | 12de711f3f9d8ad9eee9d28cf71e5487f17315d3 /libmysql | |
| parent | 4ca4f4788b2a591d52cdb5e0fe69aee2b09975ac (diff) | |
| parent | f092818715de15211638b8fd0913f151417d3450 (diff) | |
| download | mariadb-git-f5ed8784a24f12262bd01be3df63d5c891adf306.tar.gz | |
merge with 3.23.51
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 46be6103795..3735ec12f36 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -59,7 +59,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ charset.lo hash.lo mf_iocache.lo \ mf_iocache2.lo my_seek.lo \ my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo \ - my_getopt.lo + my_getopt.lo my_gethostbyname.lo # Not needed in the minimum library mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 04f62df32a9..88e003bc2c7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1638,7 +1638,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, memcpy_fixed(&sock_addr.sin_addr,&ip_addr,sizeof(ip_addr)); } else -#if defined(HAVE_GETHOSTBYNAME_R) && defined(_REENTRANT) && defined(THREAD) { int tmp_errno; struct hostent tmp_hostent,*hp; @@ -1649,22 +1648,12 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, { net->last_errno=CR_UNKNOWN_HOST; sprintf(net->last_error, ER(CR_UNKNOWN_HOST), host, tmp_errno); + my_gethostbyname_r_free(); goto error; } memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); + my_gethostbyname_r_free(); } -#else - { - struct hostent *hp; - if (!(hp=gethostbyname(host))) - { - net->last_errno=CR_UNKNOWN_HOST; - sprintf(net->last_error, ER(CR_UNKNOWN_HOST), host, socket_errno); - goto error; - } - memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); - } -#endif sock_addr.sin_port = (ushort) htons((ushort) port); if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), mysql->options.connect_timeout) <0) |