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 /include/violite.h | |
| 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 'include/violite.h')
| -rw-r--r-- | include/violite.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index 6b73dbcb943..6dd7b765071 100644 --- a/include/violite.h +++ b/include/violite.h @@ -137,8 +137,6 @@ void vio_ssl_delete(Vio* vio); int vio_ssl_read(Vio* vio,gptr buf, int size); int vio_ssl_write(Vio* vio,const gptr buf,int size); -int vio_ssl_blocking(Vio* vio,my_bool onoff); -my_bool vio_ssl_is_blocking(Vio* vio); /* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. */ int vio_ssl_fastsend(Vio* vio); @@ -152,6 +150,7 @@ int vio_ssl_close(Vio* vio); int vio_ssl_errno(Vio *vio); my_bool vio_ssl_peer_addr(Vio* vio, char *buf); void vio_ssl_in_addr(Vio *vio, struct in_addr *in); +int vio_ssl_blocking(Vio * vio, my_bool set_blocking_mode, my_bool *old_mode); /* Single copy for server */ enum vio_ssl_acceptorfd_state |