← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/sort.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-13 18:31:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2407.
  • Revision ID: olafvdspek@gmail.com-20110813183131-tvp5kxqo9l4z82eo
Refactor iocache

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/sort.cc
442
442
  if (not tempfile->inited() && tempfile->open_cached_file(P_tmpdir, "ST", DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
443
443
    return(1);
444
444
 
445
 
  buffpek->file_pos=my_b_tell(tempfile);
 
445
  buffpek->file_pos= tempfile->tell();
446
446
  buffpek->count=count;
447
447
 
448
448
  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
481
481
  if (not tempfile->inited() && tempfile->open_cached_file(P_tmpdir, "ST", DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
482
482
    return(1);
483
483
 
484
 
  buffpek->file_pos=my_b_tell(tempfile);
 
484
  buffpek->file_pos= tempfile->tell();
485
485
  buffpek->count=count;
486
486
  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
487
487
  {
700
700
  maxcount=keys/((uint) (Tb-Fb) +1);
701
701
  assert(maxcount > 0);
702
702
  if (to_file)
703
 
    to_start_filepos=my_b_tell(to_file);
 
703
    to_start_filepos= to_file->tell();
704
704
  strpos=(unsigned char*) sort_keys;
705
705
  sort_length=info->key_length;
706
706