diff options
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 11 |
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; } |