← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_malloc.cc

  • Committer: Monty Taylor
  • Date: 2008-09-22 23:53:43 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080922235343-ihqvp6g9k1mtzxmc
Renamed max/min.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_malloc.cc
100
100
  if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin))
101
101
  {
102
102
    // Safety if to_cs->mbmaxlen > 0
103
 
    new_length= min(arg_length, max_res_length);
 
103
    new_length= cmin(arg_length, max_res_length);
104
104
    memcpy(pos, str, new_length);
105
105
  }
106
106
  else