← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merged Padraig.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
46
46
                                     unsigned char *buf);
47
47
 
48
48
static ha_rows find_all_keys(SORTPARAM *param,
49
 
                             optimizer::SQL_SELECT *select,
 
49
                             optimizer::SqlSelect *select,
50
50
                             unsigned char * *sort_keys, 
51
51
                             IO_CACHE *buffer_file,
52
52
                             IO_CACHE *tempfile,
107
107
*/
108
108
 
109
109
ha_rows filesort(Session *session, Table *table, SORT_FIELD *sortorder, uint32_t s_length,
110
 
                 optimizer::SQL_SELECT *select, ha_rows max_rows,
 
110
                 optimizer::SqlSelect *select, ha_rows max_rows,
111
111
                 bool sort_positions, ha_rows *examined_rows)
112
112
{
113
113
  int error;
134
134
 
135
135
  /*
136
136
    Don't use table->sort in filesort as it is also used by
137
 
    QUICK_INDEX_MERGE_SELECT. Work with a copy and put it back at the end
 
137
    QuickIndexMergeSelect. Work with a copy and put it back at the end
138
138
    when index_merge select has finished with it.
139
139
  */
140
140
  memcpy(&table_sort, &table->sort, sizeof(filesort_info_st));
452
452
*/
453
453
 
454
454
static ha_rows find_all_keys(SORTPARAM *param, 
455
 
                             optimizer::SQL_SELECT *select,
 
455
                             optimizer::SqlSelect *select,
456
456
                             unsigned char **sort_keys,
457
457
                             IO_CACHE *buffpek_pointers,
458
458
                             IO_CACHE *tempfile, IO_CACHE *indexfile)