diff options
| author | unknown <tonu@x153.internalnet> | 2001-08-30 04:28:55 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-08-30 04:28:55 +0800 |
| commit | 6b6483ef6fea275d27c8ea49f4d009e9cf6b181f (patch) | |
| tree | 6d44e8893ce2a3b240acc06d5c34bb41942392ce /vio | |
| parent | 9ec46a996c4cfa7f2528a29c43cda2d29ec35bc7 (diff) | |
| download | mariadb-git-6b6483ef6fea275d27c8ea49f4d009e9cf6b181f.tar.gz | |
OpenSSL work
readline/callback.c:
warning removed
sql/mysqld.cc:
Warning removed abut freeing zero pointer
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index bf151c19928..d5573cdfa64 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -143,6 +143,7 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode) DBUG_ENTER("vio_blocking"); DBUG_PRINT("enter", ("set_blocking_mode: %d", (int) set_blocking_mode)); +#if !defined(HAVE_OPENSSL) #if !defined(___WIN__) && !defined(__EMX__) #if !defined(NO_FCNTL_NONBLOCK) @@ -178,6 +179,8 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode) r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg)); } #endif /* !defined(__WIN__) && !defined(__EMX__) */ +#endif /* !defined (HAVE_OPENSSL) */ + DBUG_PRINT("exit", ("return %d", r)); DBUG_RETURN(r); } |