← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
454
454
  Session *session= current_session;
455
455
  volatile Session::killed_state *killed= &session->killed;
456
456
  handler *file;
457
 
  MY_BITMAP *save_read_set, *save_write_set;
 
457
  MyBitmap *save_read_set, *save_write_set;
458
458
 
459
459
  idx=indexpos=0;
460
460
  error=quick_select=0;
490
490
  save_read_set=  sort_form->read_set;
491
491
  save_write_set= sort_form->write_set;
492
492
  /* Set up temporary column read map for columns used by sort */
493
 
  bitmap_clear_all(&sort_form->tmp_set);
 
493
  sort_form->tmp_set.clearAll();
494
494
  /* Temporary set for register_used_fields and register_field_in_read_map */
495
495
  sort_form->read_set= &sort_form->tmp_set;
496
496
  register_used_fields(param);