← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 20:10:51 UTC
  • mfrom: (1910.2.8 merge)
  • Revision ID: brian@tangent.org-20101108201051-fmplr6oke3c088kf
Encapsulation around locking/kill

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
541
541
  unsigned char *ref_pos,*next_pos,ref_buff[MAX_REFLENGTH];
542
542
  internal::my_off_t record;
543
543
  Table *sort_form;
544
 
  volatile Session::killed_state *killed= &getSession().killed;
 
544
  volatile Session::killed_state_t *killed= getSession().getKilledPtr();
545
545
  Cursor *file;
546
546
  boost::dynamic_bitset<> *save_read_set= NULL;
547
547
  boost::dynamic_bitset<> *save_write_set= NULL;
1216
1216
  buffpek *buffpek_inst;
1217
1217
  qsort2_cmp cmp;
1218
1218
  void *first_cmp_arg;
1219
 
  volatile Session::killed_state *killed= &getSession().killed;
1220
 
  Session::killed_state not_killable;
 
1219
  volatile Session::killed_state_t *killed= getSession().getKilledPtr();
 
1220
  Session::killed_state_t not_killable;
1221
1221
 
1222
1222
  getSession().status_var.filesort_merge_passes++;
1223
1223
  if (param->not_killable)