diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 16:06:57 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 16:06:57 +0300 |
| commit | 9ef4edccc2321670320d1515a5d97d00b87e18cd (patch) | |
| tree | 0e019320823335396ab6c82c363d11708f547e43 /libmysql/manager.c | |
| parent | dc2b6e456fb16685a4191537bf83e1161cb28d93 (diff) | |
| download | mariadb-git-9ef4edccc2321670320d1515a5d97d00b87e18cd.tar.gz | |
Fix bug in SELECT SQL_CALC_FOUND_ROWS
Docs/manual.texi:
Update of new GRANT options
libmysql/manager.c:
Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
new test case
mysql-test/t/select_found.test:
new test case
sql/mysqld.cc:
Change names of some status variables
Diffstat (limited to 'libmysql/manager.c')
| -rw-r--r-- | libmysql/manager.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libmysql/manager.c b/libmysql/manager.c index fbf0a0b2c22..330c070777c 100644 --- a/libmysql/manager.c +++ b/libmysql/manager.c @@ -122,7 +122,6 @@ MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, 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; @@ -133,22 +132,12 @@ MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, { con->last_errno=tmp_errno; sprintf(con->last_error,"Could not resolve host '%s'",host); + my_gethostbyname_r_free(); goto err; } 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))) - { - con->last_errno=socket_errno; - sprintf(con->last_error, "Could not resolve host '%s'", host); - goto err; - } - 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), 0) <0) |