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 /include | |
| 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 'include')
| -rw-r--r-- | include/my_pthread.h | 7 | ||||
| -rw-r--r-- | include/violite.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 9cf337702f7..aac0222c136 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -430,11 +430,14 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) #undef pthread_cond_timedwait -#undef pthread_mutex_trylock #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) -#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *abstime); +#endif + +#if defined(HAVE_POSIX1003_4a_MUTEX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) +#undef pthread_mutex_trylock +#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #endif 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 |