database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

A correct fix for the timeout problem

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-03-08 19:35:44 +02:00
parent 937241aded
commit df1ebd2a25
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libmysql/libmysql.c
View File

@ -121,7 +121,7 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
#if defined(__WIN__) || defined(OS2) #if defined(__WIN__) || defined(OS2)
return connect(s, (struct sockaddr*) name, namelen); return connect(s, (struct sockaddr*) name, namelen);
#else #else
int flags, res, s_err; int flags, res, s_err, result=0;
SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint); SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);
fd_set sfds; fd_set sfds;
struct timeval tv; struct timeval tv;
@ -175,19 +175,16 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
* implementations of select that don't adjust tv upon * implementations of select that don't adjust tv upon
* failure to reflect the time remaining * failure to reflect the time remaining
*/ */
#ifdef HAVE_POLL
return(0);
#endif
start_time = time(NULL); start_time = time(NULL);
for (;;) for (;;)
{ {
tv.tv_sec = (long) timeout; tv.tv_sec = (long) timeout;
tv.tv_usec = 0; tv.tv_usec = 0;
#if defined(HPUX) && defined(THREAD) #if defined(HPUX) && defined(THREAD)
if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0) if ((result = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0)
break; break;
#else #else
if ((res = select(s+1, NULL, &sfds, NULL, &tv)) >= 0) if ((result = select(s+1, NULL, &sfds, NULL, &tv)) >= 0)
break; break;
#endif #endif
now_time=time(NULL); now_time=time(NULL);
@ -210,7 +207,7 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
errno = s_err; errno = s_err;
return(-1); /* but return an error... */ return(-1); /* but return an error... */
} }
return(0); /* It's all good! */ return((res) ? res : result); /* It's all good! */
#endif #endif
} }