diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mini_client.cc | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 5bd88e9b09a..5600983817b 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -294,11 +294,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); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ae80ab9ea6b..b2114b2192a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2531,7 +2531,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) while (!abort_loop) { readFDs=clientFDs; -#ifdef HPUX +#ifdef HPUX10 if (select(max_used_connection,(int*) &readFDs,0,0,0) < 0) continue; #else @@ -2545,7 +2545,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) MAYBE_BROKEN_SYSCALL continue; } -#endif /* HPUX */ +#endif /* HPUX10 */ if (abort_loop) { MAYBE_BROKEN_SYSCALL; |