Commit 5773b650 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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
parent 5ff30464

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -50257,6 +50257,9 @@ each individual 4.0.x release. 














@itemize @bullet















@item













Fixed bug in @code{SELECT DISTINCT ... FROM many_tables ORDER BY













not-used-column}.













@item















Added @code{QUOTE()} function that performs SQL quoting to produce values















that can be used as data values in queries.















@item

























include/my_pthread.h



+5
−2






























Original line number
Diff line number
Diff line








@@ -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

















































include/violite.h



+1
−2






























Original line number
Diff line number
Diff line








@@ -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

































innobase/buf/buf0buf.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -285,7 +285,7 @@ buf_page_print(





























	ut_print_timestamp(stderr);















	fprintf(stderr,













	"  InnoDB: Page dump in ascii and hex (%u bytes):\n%s",













	"  InnoDB: Page dump in ascii and hex (%lu bytes):\n%s",















					(ulint)UNIV_PAGE_SIZE, buf);















	fprintf(stderr, "InnoDB: End of page dump\n");

















































libmysqld/lib_sql.cc



+8
−3






























Original line number
Diff line number
Diff line








@@ -551,8 +551,13 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)













      sql_print_error("Warning: Can't create thread to manage maintenance");















  }





























  /* Update mysqld variables from client variables */













  /*













    Update mysqld variables from client variables if set













    The client variables are set also by get_one_option() in mysqld.cc













  */













  if (max_allowed_packet)















    global_system_variables.max_allowed_packet= max_allowed_packet;













  if (net_buffer_length)















    global_system_variables.net_buffer_length= net_buffer_length;















  return 0;















}