← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/fstring.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/field/fstring.cc
215
215
                          uint max_length,
216
216
                          bool low_byte_first __attribute__((unused)))
217
217
{
218
 
  uint length=      min(field_length,max_length);
 
218
  uint length=      cmin(field_length,max_length);
219
219
  uint local_char_length= max_length/field_charset->mbmaxlen;
220
220
  if (length > local_char_length)
221
221
    local_char_length= my_charpos(field_charset, from, from+length,
258
258
                     bool low_byte_first __attribute__((unused)))
259
259
{
260
260
  uint from_length=
261
 
    param_data ? min(param_data & 0x00ff, field_length) : field_length;
 
261
    param_data ? cmin(param_data & 0x00ff, field_length) : field_length;
262
262
  uint length;
263
263
 
264
264
  if (from_length > 255)