← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/sort.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-21 23:44:24 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: osullivan.padraig@gmail.com-20090321234424-n0brsq8frbih0a3d
Removing unused variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/sort.cc
891
891
  ha_rows count;
892
892
  my_off_t to_start_filepos= 0;
893
893
  unsigned char *strpos;
894
 
  BUFFPEK *buffpek,**refpek;
 
894
  BUFFPEK *buffpek;
895
895
  priority_queue<BUFFPEK *, vector<BUFFPEK *>, compare_functor > 
896
896
    queue(compare_functor(info->key_cmp, info));
897
897
  volatile int *killed= killed_ptr(info->sort_info->param);
945
945
      {
946
946
        if (!(error=(int) info->read_to_buffer(from_file,buffpek,sort_length)))
947
947
        {
948
 
          unsigned char *base=buffpek->base;
949
 
          uint32_t max_keys=buffpek->max_keys;
950
 
 
951
948
          queue.pop();
952
949
          break;                /* One buffer have been removed */
953
950
        }