← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2010-05-20 06:34:25 UTC
  • mto: (1552.1.1 new-staging)
  • mto: This revision was merged to the branch mainline in revision 1553.
  • Revision ID: brian@gaz-20100520063425-0hwu5fx4fmmp2g49
Partial encapsulation of TableShare from Table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
148
148
  TableList *tab= table->pos_in_table_list;
149
149
  Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
150
150
 
151
 
  DRIZZLE_FILESORT_START(table->s->getSchemaName(), table->s->getTableName());
 
151
  DRIZZLE_FILESORT_START(table->getShare()->getSchemaName(), table->getShare()->getTableName());
152
152
 
153
153
  /*
154
154
   Release InnoDB's adaptive hash index latch (if holding) before
561
561
        if (!flag)
562
562
        {
563
563
          internal::my_store_ptr(ref_pos,ref_length,record); // Position to row
564
 
          record+= sort_form->s->db_record_offset;
 
564
          record+= sort_form->getShare()->db_record_offset;
565
565
        }
566
566
        else if (!error)
567
567
          file->position(sort_form->record[0]);