← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Brian Aker
  • Date: 2009-11-11 21:40:59 UTC
  • mfrom: (1208.3.3 reference)
  • mto: This revision was merged to the branch mainline in revision 1212.
  • Revision ID: brian@gaz-20091111214059-0xfxkwrrixpx2jd9
Update for cursor name change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
79
79
    if (join_tab->rowid_keep_flags & JoinTable::KEEP_ROWID)
80
80
    {
81
81
      cache->fields++;
82
 
      join_tab->used_fieldlength += join_tab->table->file->ref_length;
 
82
      join_tab->used_fieldlength += join_tab->table->cursor->ref_length;
83
83
    }
84
84
  }
85
85
  if (!(cache->field=(CACHE_FIELD*)
142
142
    /* SemiJoinDuplicateElimination: Allocate space for rowid if needed */
143
143
    if (tables[i].rowid_keep_flags & JoinTable::KEEP_ROWID)
144
144
    {
145
 
      copy->str= tables[i].table->file->ref;
146
 
      copy->length= tables[i].table->file->ref_length;
 
145
      copy->str= tables[i].table->cursor->ref;
 
146
      copy->length= tables[i].table->cursor->ref_length;
147
147
      copy->strip=0;
148
148
      copy->blob_field=0;
149
149
      copy->get_rowid= NULL;
209
209
    {
210
210
      // SemiJoinDuplicateElimination: Get the rowid into table->ref:
211
211
      if (copy->get_rowid)
212
 
        copy->get_rowid->file->position(copy->get_rowid->record[0]);
 
212
        copy->get_rowid->cursor->position(copy->get_rowid->record[0]);
213
213
 
214
214
      if (copy->strip)
215
215
      {