diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 16:32:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 16:32:51 +0300 |
| commit | d2b95cd7ab5b3ed450af572e9c77cd11d3c420ba (patch) | |
| tree | 145820cb9685468167f09ba07a59a1f61ca640cf /sql/mini_client.cc | |
| parent | eba5ec8b4bceabab302462db850882f715a7b040 (diff) | |
| download | mariadb-git-d2b95cd7ab5b3ed450af572e9c77cd11d3c420ba.tar.gz | |
New my_gethostbyname_r() handling
Changed some status variable names
Fix bug in GRANT ... PASSWORD string
Docs/manual.texi:
Update of variable names
include/my_net.h:
New my_gethostbyname_r() handling
include/my_pthread.h:
New my_gethostbyname_r() handling
libmysql/Makefile.shared:
New my_gethostbyname_r() handling
libmysql/libmysql.c:
New my_gethostbyname_r() handling
mysys/Makefile.am:
New my_gethostbyname_r() handling
mysys/my_pthread.c:
New my_gethostbyname_r() handling
mysys/my_thr_init.c:
New my_gethostbyname_r() handling
sql/hostname.cc:
New my_gethostbyname_r() handling
sql/mini_client.cc:
New my_gethostbyname_r() handling
sql/mysqld.cc:
change some status variable names
sql/sql_acl.cc:
Fix bug in GRANT ... PASSWORD string
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 3dfd58375a5..8f703b80e3a 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -614,7 +614,6 @@ mc_mysql_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; @@ -625,22 +624,12 @@ mc_mysql_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 (mc_sock_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), mysql->options.connect_timeout) <0) |