← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: lbieber
  • Date: 2010-08-10 18:52:46 UTC
  • mfrom: (1698.1.2 staging)
  • Revision ID: lbieber@orisndriz03-20100810185246-7nawc4svsxr4llh5
Merge Joe -remove the increment wrapper calls in my_pthread.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
210
210
 
211
211
  if (select && select->quick)
212
212
  {
213
 
    status_var_increment(session->status_var.filesort_range_count);
 
213
    session->status_var.filesort_range_count++;
214
214
  }
215
215
  else
216
216
  {
217
 
    status_var_increment(session->status_var.filesort_scan_count);
 
217
    session->status_var.filesort_scan_count++;
218
218
  }
219
219
#ifdef CAN_TRUST_RANGE
220
220
  if (select && select->quick && select->quick->records > 0L)
350
350
    }
351
351
  }
352
352
  if (error)
 
353
  {
353
354
    my_message(ER_FILSORT_ABORT, ER(ER_FILSORT_ABORT),
354
355
               MYF(ME_ERROR+ME_WAITTANG));
 
356
  }
355
357
  else
356
 
    statistic_add(session->status_var.filesort_rows, (uint32_t) records, NULL);
 
358
  {
 
359
    session->status_var.filesort_rows+= (uint32_t) records;
 
360
  }
357
361
  *examined_rows= param.examined_rows;
358
362
  memcpy(&table->sort, &table_sort, sizeof(filesort_info_st));
359
363
  DRIZZLE_FILESORT_DONE(error, records);
1139
1143
  volatile Session::killed_state *killed= &current_session->killed;
1140
1144
  Session::killed_state not_killable;
1141
1145
 
1142
 
  status_var_increment(current_session->status_var.filesort_merge_passes);
 
1146
  current_session->status_var.filesort_merge_passes++;
1143
1147
  if (param->not_killable)
1144
1148
  {
1145
1149
    killed= &not_killable;