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

1 files changed, 8 insertions, 3 deletions

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 8922b8326d3..0774254baa7 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -551,9 +551,14 @@ 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 */
-  global_system_variables.max_allowed_packet=max_allowed_packet;
-  global_system_variables.net_buffer_length=net_buffer_length;
+  /*
+    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;
 }