← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Stewart Smith
  • Date: 2011-01-21 01:09:12 UTC
  • mfrom: (2099 staging)
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110121010912-x5ogi8rm08nortxp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
564
564
  if (! indexfile && ! quick_select)
565
565
  {
566
566
    next_pos=(unsigned char*) 0;                        /* Find records in sequence */
567
 
    file->startTableScan(1);
 
567
    if (file->startTableScan(1))
 
568
      return(HA_POS_ERROR);
568
569
    file->extra_opt(HA_EXTRA_CACHE, getSession().variables.read_buff_size);
569
570
  }
570
571
 
574
575
    if (select->quick->reset())
575
576
      return(HA_POS_ERROR);
576
577
 
577
 
    read_record_info.init_read_record(&getSession(), select->quick->head, select, 1, 1);
 
578
    if (read_record_info.init_read_record(&getSession(), select->quick->head, select, 1, 1))
 
579
      return(HA_POS_ERROR);
578
580
  }
579
581
 
580
582
  /* Remember original bitmaps */