← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
4775
4775
        */
4776
4776
        if (used_key_parts_map.test(key_part_nr))
4777
4777
          continue;
4778
 
        if (key_part_nr < 1 || key_part_nr > join->fields_list.elements)
 
4778
        if (key_part_nr < 1 || key_part_nr > join->fields_list.size())
4779
4779
          goto next_index;
4780
4780
        cur_part= cur_index_info->key_part + key_part_nr - 1;
4781
4781
        cur_group_prefix_len+= cur_part->store_length;