← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.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/unireg.cc
468
468
    }
469
469
    cfield->row=(uint8_t) row;
470
470
    cfield->col=(uint8_t) (length+1);
471
 
    cfield->sc_length=(uint8_t) min(cfield->length,cols-(length+2));
 
471
    cfield->sc_length=(uint8_t) min(cfield->length,(ulong)cols-(length+2));
472
472
  }
473
473
  length=(uint) (pos-start_screen);
474
474
  int2store(start_screen,length);
686
686
    return(1);
687
687
  }
688
688
  /* Hack to avoid bugs with small static rows in MySQL */
689
 
  reclength=max(file->min_record_length(table_options),reclength);
 
689
  reclength=max((ulong)file->min_record_length(table_options),reclength);
690
690
  if (info_length+(ulong) create_fields.elements*FCOMP+288+
691
691
      n_length+int_length+com_length > 65535L || int_count > 255)
692
692
  {