← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

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->db.str, table->s->table_name.str);
 
151
  DRIZZLE_FILESORT_START(table->s->getSchemaName(), table->s->getTableName());
152
152
 
153
153
  /*
154
154
   Release InnoDB's adaptive hash index latch (if holding) before