← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Brian Aker
  • Date: 2010-06-05 00:14:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1592.
  • Revision ID: brian@gir-20100605001439-kn5v6oaspacx5q6l
Merge in change to getTable() to private the field objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
3960
3960
  {
3961
3961
    uint16_t fieldnr= param->table->key_info[keynr].
3962
3962
                    key_part[kp - table_key->key_part].fieldnr - 1;
3963
 
    if (param->table->field[fieldnr]->key_length() != kp->length)
 
3963
    if (param->table->getField(fieldnr)->key_length() != kp->length)
3964
3964
      return false;
3965
3965
  }
3966
3966
 
4723
4723
      /* For each table field */
4724
4724
      for (uint32_t i= 0; i < table->getShare()->sizeFields(); i++)
4725
4725
      {
4726
 
        Field *cur_field= table->field[i];
 
4726
        Field *cur_field= table->getField(i);
4727
4727
        /*
4728
4728
          If the field is used in the current query ensure that it's
4729
4729
          part of 'cur_index'