diff options
| author | monty@hundin.mysql.fi <> | 2002-06-02 20:46:03 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-02 20:46:03 +0300 |
| commit | 544f95c45112993df1d31d3eda859dd5e4efff89 (patch) | |
| tree | 8de3d7e1875b8751450433ee53331ffb7322e7b5 /libmysql | |
| parent | 44a631f1fc75abc897d606eb4c75e9898bff7e54 (diff) | |
| parent | 5f93b1e46ac09a45524acb9803b8cd7f951599ef (diff) | |
| download | mariadb-git-544f95c45112993df1d31d3eda859dd5e4efff89.tar.gz | |
merge with 3.23
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 88e003bc2c7..73fc1feb472 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -217,8 +217,13 @@ int my_connect(my_socket s, const struct sockaddr *name, uint namelen, { tv.tv_sec = (long) timeout; tv.tv_usec = 0; +#if defined(HPUX) && defined(THREAD) + if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0) + break; +#else if ((res = select(s+1, NULL, &sfds, NULL, &tv)) >= 0) break; +#endif now_time=time(NULL); timeout-= (uint) (now_time - start_time); if (errno != EINTR || (int) timeout <= 0) |