diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-31 15:22:38 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-31 15:22:38 +0300 |
| commit | 0ceaf6d2c28f4f639a0ba5c329964e4dbe71cb7f (patch) | |
| tree | 85c51f351e6086eebde739636a64e7ab09b85277 /libmysql | |
| parent | 2c058d84784c67bd514ad6c879333d2c9aac8161 (diff) | |
| download | mariadb-git-0ceaf6d2c28f4f639a0ba5c329964e4dbe71cb7f.tar.gz | |
Portability fixes for SCO and HPUX
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name
Docs/manual.texi:
Update of TRUNCATE() information
configure.in:
Fix for HPUX
extra/resolveip.c:
Fix for SCO
include/my_net.h:
Fix for HPUX
libmysql/libmysql.c:
Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
Test of new TRUNCATE handling
mysql-test/t/func_math.test:
Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
Portability fix
sql/item_func.cc:
Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
Fix NULL handling for DESCRIBE table_name
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 4190a4c37f4..bab6d304094 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -180,8 +180,13 @@ static int connect2(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) |