← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/filesort.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/filesort.cc
1081
1081
 
1082
1082
  if ((count=(uint) min((ha_rows) buffpek->max_keys,buffpek->count)))
1083
1083
  {
1084
 
    if (my_pread(fromfile->file,(uchar*) buffpek->base,
1085
 
                 (length= rec_length*count),buffpek->file_pos,MYF_RW))
 
1084
    if (pread(fromfile->file,(uchar*) buffpek->base, (length= rec_length*count),buffpek->file_pos) == 0)
1086
1085
      return((uint) -1);                        /* purecov: inspected */
1087
1086
    buffpek->key=buffpek->base;
1088
1087
    buffpek->file_pos+= length;                 /* New filepos */