diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:47:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:47:06 +0200 |
| commit | fee8f2d27314c93485cba8c164b28f49fae4ca43 (patch) | |
| tree | a23232924484341af1a5324e631537ba952b8e8c /extra | |
| parent | 944666ef1d883413fac1721f58e002f3fe83cfc7 (diff) | |
| parent | 100e92f489efdca16a8cbfcfb2ee80c7348fc401 (diff) | |
| download | mariadb-git-fee8f2d27314c93485cba8c164b28f49fae4ca43.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
client/mysqltest.c:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/socket_wrapper.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp index 2252dfafdc5..91cea1f9753 100644 --- a/extra/yassl/src/socket_wrapper.cpp +++ b/extra/yassl/src/socket_wrapper.cpp @@ -93,11 +93,15 @@ void Socket::closeSocket() uint Socket::get_ready() const { - unsigned long ready = 0; - #ifdef _WIN32 + unsigned long ready = 0; ioctlsocket(socket_, FIONREAD, &ready); #else + /* + 64-bit Solaris requires the variable passed to + FIONREAD be a 32-bit value. + */ + int ready = 0; ioctl(socket_, FIONREAD, &ready); #endif |