← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/protocol.cc

  • Committer: Monty Taylor
  • Date: 2008-08-10 06:11:44 UTC
  • mto: (312.1.3 translations)
  • mto: This revision was merged to the branch mainline in revision 295.
  • Revision ID: monty@inaugust.com-20080810061144-llnyqeju5zckd6pw
Oy. Replaced max and min macros with std::max and std::min so that we get
strong typing. And, then, cast things in the right direction...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/protocol.cc
175
175
  pos+=2;
176
176
 
177
177
  /* We can only return up to 65535 warnings in two bytes */
178
 
  uint tmp= min(total_warn_count, 65535);
 
178
  uint tmp= min(total_warn_count, (uint)65535);
179
179
  int2store(pos, tmp);
180
180
  pos+= 2;
181
181
 
237
237
    Don't send warn count during SP execution, as the warn_list
238
238
    is cleared between substatements, and mysqltest gets confused
239
239
  */
240
 
  uint tmp= min(total_warn_count, 65535);
 
240
  uint tmp= min(total_warn_count, (uint)65535);
241
241
  buff[0]= DRIZZLE_PROTOCOL_NO_MORE_DATA;
242
242
  int2store(buff+1, tmp);
243
243
  /*