← 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-10-02 01:31:53 UTC
  • mfrom: (398.1.6 codestyle-new)
  • Revision ID: monty@inaugust.com-20081002013153-b097om921cd3j1pn
Merged from stdint-includes-fix.

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