← 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-10-08 14:22:02 UTC
  • mfrom: (1802.16.21 bug621875)
  • mto: This revision was merged to the branch mainline in revision 1824.
  • Revision ID: brian@tangent.org-20101008142202-96maf31n9odkc13n
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
491
491
  Table *sort_form;
492
492
  volatile Session::killed_state *killed= &session->killed;
493
493
  Cursor *file;
494
 
  MyBitmap *save_read_set, *save_write_set;
 
494
  boost::dynamic_bitset<> *save_read_set= NULL;
 
495
  boost::dynamic_bitset<> *save_write_set= NULL;
495
496
 
496
497
  idx=indexpos=0;
497
498
  error=quick_select=0;
527
528
  save_read_set=  sort_form->read_set;
528
529
  save_write_set= sort_form->write_set;
529
530
  /* Set up temporary column read map for columns used by sort */
530
 
  sort_form->tmp_set.clearAll();
 
531
  sort_form->tmp_set.reset();
531
532
  /* Temporary set for register_used_fields and register_field_in_read_map */
532
533
  sort_form->read_set= &sort_form->tmp_set;
533
534
  register_used_fields(param);
534
535
  if (select && select->cond)
535
536
    select->cond->walk(&Item::register_field_in_read_map, 1,
536
537
                       (unsigned char*) sort_form);
537
 
  sort_form->column_bitmaps_set(&sort_form->tmp_set, &sort_form->tmp_set);
 
538
  sort_form->column_bitmaps_set(sort_form->tmp_set, sort_form->tmp_set);
538
539
 
539
540
  for (;;)
540
541
  {
621
622
    return(HA_POS_ERROR);
622
623
 
623
624
  /* Signal we should use orignal column read and write maps */
624
 
  sort_form->column_bitmaps_set(save_read_set, save_write_set);
 
625
  sort_form->column_bitmaps_set(*save_read_set, *save_write_set);
625
626
 
626
627
  if (error != HA_ERR_END_OF_FILE)
627
628
  {