← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.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/join.cc
5385
5385
    join->unit->select_limit_cnt= 1;            // Only send first row
5386
5386
    return(0);
5387
5387
  }
5388
 
  Field **first_field=entry->field+entry->getShare()->sizeFields() - field_count;
 
5388
  Field **first_field=entry->getFields() + entry->getShare()->sizeFields() - field_count;
5389
5389
  offset= (field_count ?
5390
 
           entry->field[entry->getShare()->sizeFields() - field_count]->
5391
 
           offset(entry->record[0]) : 0);
 
5390
           entry->getField(entry->getShare()->sizeFields() - field_count)->offset(entry->record[0]) : 0);
5392
5391
  reclength= entry->getShare()->getRecordLength() - offset;
5393
5392
 
5394
5393
  entry->free_io_cache();                               // Safety
6045
6044
 
6046
6045
  for (uint32_t i=0 ; i < join_tab->ref.key_parts ; i++)
6047
6046
  {
6048
 
    Field *field=table->field[table->key_info[join_tab->ref.key].key_part[i].
6049
 
                              fieldnr-1];
 
6047
    Field *field=table->getField(table->key_info[join_tab->ref.key].key_part[i].fieldnr - 1);
6050
6048
    Item *value=join_tab->ref.items[i];
6051
6049
    cond->add(new Item_func_equal(new Item_field(field), value));
6052
6050
  }