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

Merge with 4.0

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-03-16 19:17:54 +02:00
parent ce7db2827e ba46c7289c
commit a434bca704
196 changed files with 11754 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libmysql/libmysql.c
View File

@ -192,9 +192,10 @@ my_bool my_connect(my_socket s, const struct sockaddr *name,
struct timeval tv;
time_t start_time, now_time;
/* If they passed us a timeout of zero, we should behave
* exactly like the normal connect() call does.
*/
/*
If they passed us a timeout of zero, we should behave
exactly like the normal connect() call does.
*/
if (timeout == 0)
return connect(s, (struct sockaddr*) name, namelen) != 0;
@ -247,12 +248,14 @@ my_bool my_connect(my_socket s, const struct sockaddr *name,
tv.tv_sec = (long) timeout;
tv.tv_usec = 0;
#if defined(HPUX10) && defined(THREAD)
if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0)
if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) > 0)
break;
#else
if ((res = select(s+1, NULL, &sfds, NULL, &tv)) >= 0)
if ((res = select(s+1, NULL, &sfds, NULL, &tv)) > 0)
break;
#endif
if (res == 0) /* timeout */
return -1;
now_time=time(NULL);
timeout-= (uint) (now_time - start_time);
if (errno != EINTR || (int) timeout <= 0)
@ -274,7 +277,8 @@ my_bool my_connect(my_socket s, const struct sockaddr *name,
errno = s_err;
return(1); /* but return an error... */
}
return(0); /* It's all good! */
return (0); /* ok */
#endif
}