← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Monty Taylor
  • Date: 2010-05-21 06:34:45 UTC
  • mfrom: (1530.2.8)
  • mto: (1530.5.7)
  • mto: This revision was merged to the branch mainline in revision 1560.
  • Revision ID: mordred@inaugust.com-20100521063445-8isexfjpicuqhf5a
Merged fix-lcov-failure into new-valgrind-suppressions.

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->getSchemaName(), table->s->getTableName());
 
151
  DRIZZLE_FILESORT_START(table->getShare()->getSchemaName(), table->getShare()->getTableName());
152
152
 
153
153
  /*
154
154
   Release InnoDB's adaptive hash index latch (if holding) before
510
510
                    current_session->variables.read_buff_size);
511
511
  }
512
512
 
513
 
  READ_RECORD read_record_info;
 
513
  ReadRecord read_record_info;
514
514
  if (quick_select)
515
515
  {
516
516
    if (select->quick->reset())
517
517
      return(HA_POS_ERROR);
518
 
    init_read_record(&read_record_info, current_session, select->quick->head,
519
 
                     select, 1, 1);
 
518
 
 
519
    read_record_info.init_read_record(current_session, select->quick->head, select, 1, 1);
520
520
  }
521
521
 
522
522
  /* Remember original bitmaps */
561
561
        if (!flag)
562
562
        {
563
563
          internal::my_store_ptr(ref_pos,ref_length,record); // Position to row
564
 
          record+= sort_form->s->db_record_offset;
 
564
          record+= sort_form->getShare()->db_record_offset;
565
565
        }
566
566
        else if (!error)
567
567
          file->position(sort_form->record[0]);
604
604
      index_merge quick select uses table->sort when retrieving rows, so free
605
605
      resoures it has allocated.
606
606
    */
607
 
    end_read_record(&read_record_info);
 
607
    read_record_info.end_read_record();
608
608
  }
609
609
  else
610
610
  {