← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/net_serv.cc

  • Committer: Brian Aker
  • Date: 2009-06-16 00:53:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1094.
  • Revision ID: brian@gaz-20090616005322-w0ode4jul9z8s2y9
Partial fix for tests for tmp

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
 
 
39
37
using namespace std;
40
38
 
41
39
/*
62
60
                         (uint32_t)global_system_variables.net_write_timeout);
63
61
 
64
62
  net->retry_count=  (uint32_t) global_system_variables.net_retry_count;
65
 
  net->max_packet_size= max(global_system_variables.net_buffer_length,
 
63
  net->max_packet_size= cmax(global_system_variables.net_buffer_length,
66
64
                             global_system_variables.max_allowed_packet);
67
65
}
68
66