← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/net_serv.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/net_serv.cc
34
34
#include <sys/poll.h>
35
35
#include <zlib.h>
36
36
 
 
37
#include <algorithm>
 
38
 
37
39
using namespace std;
38
40
 
39
41
/*
60
62
                         (uint32_t)global_system_variables.net_write_timeout);
61
63
 
62
64
  net->retry_count=  (uint32_t) global_system_variables.net_retry_count;
63
 
  net->max_packet_size= cmax(global_system_variables.net_buffer_length,
 
65
  net->max_packet_size= max(global_system_variables.net_buffer_length,
64
66
                             global_system_variables.max_allowed_packet);
65
67
}
66
68