~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2009-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
465
465
  ref_pos= ref_buff;
466
466
  quick_select=select && select->quick;
467
467
  record=0;
468
 
  flag= ((!indexfile && file->ha_table_flags() & HA_REC_NOT_IN_SEQ)
 
468
  flag= ((!indexfile && ! file->isOrdered())
469
469
         || quick_select);
470
470
  if (indexfile || flag)
471
471
    ref_pos= &file->ref[0];
589
589
 
590
590
  if (error != HA_ERR_END_OF_FILE)
591
591
  {
592
 
    file->print_error(error,MYF(ME_ERROR | ME_WAITTANG));
 
592
    sort_form->print_error(error,MYF(ME_ERROR | ME_WAITTANG));
593
593
    return(HA_POS_ERROR);
594
594
  }
595
595
  if (indexpos && idx &&