diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-17 00:35:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-17 00:35:51 +0300 |
| commit | 96f2e21e99394352ad062ae788e70a17a788f92c (patch) | |
| tree | a5bba2df04761e778b4e626fc71182b2708f85ff /vio | |
| parent | 7139794e299b9b9f118dbf4a9cddfbb027776983 (diff) | |
| download | mariadb-git-96f2e21e99394352ad062ae788e70a17a788f92c.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
Docs/manual.texi:
Changelog
include/my_pthread.h:
Fix for pthread_mutex_trylock when used with SAFEMUTEX
include/violite.h:
Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
innobase/buf/buf0buf.c:
Fixed wrong format string
libmysqld/lib_sql.cc:
Fixed hangup in embedded server.
mysql-test/r/distinct.result:
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysql-test/t/distinct.test:
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysys/my_pthread.c:
Cleanup of pthread_xxx rewrite code.
Fixed bug in pthread_mutex_trylock with HPUX 11.0
sql/gen_lex_hash.cc:
Smaller hash array
sql/mysqld.cc:
Fixed hangup in embedded server.
sql/sql_select.cc:
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
vio/vio.c:
Added vio_ssl_blocking
vio/viossl.c:
Added vio_ssl_blocking
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/viossl.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/vio/vio.c b/vio/vio.c index bb97f195110..445aec3e3a7 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -60,7 +60,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->vioclose =vio_ssl_close; vio->peer_addr =vio_ssl_peer_addr; vio->in_addr =vio_ssl_in_addr; - vio->vioblocking =vio_blocking; + vio->vioblocking =vio_ssl_blocking; vio->is_blocking =vio_is_blocking; } else /* default is VIO_TYPE_TCPIP */ 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 */ |