← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merge Monty -> cppcheck changes, plus change to deleteTable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
328
328
      free(param.tmp_buffer);
329
329
  if (!subselect || !subselect->is_uncacheable())
330
330
  {
331
 
    if ((unsigned char*) sort_keys)
332
 
      free((unsigned char*) sort_keys);
 
331
    free(sort_keys);
333
332
    table_sort.sort_keys= 0;
334
 
    if ((unsigned char*) buffpek)
335
 
      free((unsigned char*) buffpek);
 
333
    free(buffpek);
336
334
    table_sort.buffpek= 0;
337
335
    table_sort.buffpek_len= 0;
338
336
  }