← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 19:16:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624191657-20dgaeuk12rjcplz
The remaining files using cmax have been converted to std::max.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
6266
6266
    }
6267
6267
  }
6268
6268
  seq->param->range_count++;
6269
 
  seq->param->max_key_part=cmax(seq->param->max_key_part,(uint32_t)key_tree->part);
 
6269
  seq->param->max_key_part= max(seq->param->max_key_part,(uint32_t)key_tree->part);
6270
6270
  return 0;
6271
6271
}
6272
6272
 
8169
8169
        cur_group_prefix_len+= cur_part->store_length;
8170
8170
        used_key_parts_map.set(key_part_nr);
8171
8171
        ++cur_group_key_parts;
8172
 
        max_key_part= cmax(max_key_part,key_part_nr);
 
8172
        max_key_part= max(max_key_part,key_part_nr);
8173
8173
      }
8174
8174
      /*
8175
8175
        Check that used key parts forms a prefix of the index.