← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merge of Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
114
114
  TableList *tab= table->pos_in_table_list;
115
115
  Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
116
116
 
117
 
  DRIZZLE_FILESORT_START();
 
117
  DRIZZLE_FILESORT_START(table->s->db.str, table->s->table_name.str);
118
118
 
119
119
  /*
120
120
   Release InnoDB's adaptive hash index latch (if holding) before
324
324
                  (uint32_t) records, &LOCK_status);
325
325
  *examined_rows= param.examined_rows;
326
326
  memcpy(&table->sort, &table_sort, sizeof(filesort_info_st));
327
 
  DRIZZLE_FILESORT_END();
328
 
  return(error ? HA_POS_ERROR : records);
 
327
  DRIZZLE_FILESORT_DONE(error, records);
 
328
  return (error ? HA_POS_ERROR : records);
329
329
} /* filesort */
330
330
 
331
331