diff options
| author | monty@hundin.mysql.fi <> | 2002-08-17 00:35:51 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-17 00:35:51 +0300 |
| commit | 5773b6504a888d61af1cdf7c0764bff7860ab90a (patch) | |
| tree | a5bba2df04761e778b4e626fc71182b2708f85ff /vio/viossl.c | |
| parent | 5ff30464a68f70e01664a0af8dd9406e839c99ab (diff) | |
| download | mariadb-git-5773b6504a888d61af1cdf7c0764bff7860ab90a.tar.gz | |
Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 7365bdc3daf..6d4f5450148 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -362,4 +362,14 @@ void sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio, long timeout) DBUG_VOID_RETURN; } + +int vio_ssl_blocking(Vio * vio __attribute__((unused)), + my_bool set_blocking_mode, + my_bool *old_mode) +{ + /* Return error if we try to change to non_blocking mode */ + *old_mode=1; /* Mode is always blocking */ + return set_blocking_mode ? 0 : 1; +} + #endif /* HAVE_OPENSSL */ |