diff options
| author | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
| commit | 5b1ced458013509629c7e8e052b88910cfbb6afd (patch) | |
| tree | bce40fe371fa0025ed0a77a664f62de77cdd04bf /sql/mini_client.cc | |
| parent | 8c8b97fdf4756a699346ae1688136624d76713bc (diff) | |
| parent | 1049175831a4aa145f64e912388cc6079d7f5789 (diff) | |
| download | mariadb-git-5b1ced458013509629c7e8e052b88910cfbb6afd.tar.gz | |
Merge....
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
libmysql/password.c:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 52725f2acc0..7d3b10a34a9 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -297,11 +297,11 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, FD_SET(s, &sfds); tv.tv_sec = (long) to; tv.tv_usec = 0; -#ifdef HPUX +#ifdef HPUX10 res = select(s+1, NULL, (int*) &sfds, NULL, &tv); #else res = select(s+1, NULL, &sfds, NULL, &tv); -#endif +#endif /* HPUX10 */ if (res <= 0) /* Never became writable */ return(-1); |