← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.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/filesort.cc
203
203
    goto err;
204
204
 
205
205
  memavl= thd->variables.sortbuff_size;
206
 
  min_sort_memory= max(MIN_SORT_MEMORY, param.sort_length*MERGEBUFF2);
 
206
  min_sort_memory= max((uint)MIN_SORT_MEMORY, param.sort_length*MERGEBUFF2);
207
207
  while (memavl >= min_sort_memory)
208
208
  {
209
209
    ulong old_memavl;