← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/net_serv.cc

Merged remove-dead-Item-save_in_field_no_warnings into fix-order_st-BY-comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/net_serv.cc
63
63
{
64
64
  net->vio = vio;
65
65
  net->max_packet= (uint32_t) buffer_length;
66
 
  net->max_packet_size= max(buffer_length, global_system_variables.max_allowed_packet);
 
66
  net->max_packet_size= max(buffer_length, drizzled::global_system_variables.max_allowed_packet);
67
67
 
68
68
  if (!(net->buff=(unsigned char*) malloc((size_t) net->max_packet+
69
69
                                          NET_HEADER_SIZE + COMP_HEADER_SIZE)))