← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Jay Pipes
  • Date: 2009-08-05 19:17:08 UTC
  • mfrom: (1111 staging)
  • mto: (1115.3.12 captain)
  • mto: This revision was merged to the branch mainline in revision 1112.
  • Revision ID: jpipes@serialcoder-20090805191708-9mawjpke3fe3i7j6
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
329
329
} /* filesort */
330
330
 
331
331
 
332
 
void filesort_free_buffers(Table *table, bool full)
 
332
void Table::filesort_free_buffers(bool full)
333
333
{
334
 
  if (table->sort.record_pointers)
 
334
  if (sort.record_pointers)
335
335
  {
336
 
    free((unsigned char*) table->sort.record_pointers);
337
 
    table->sort.record_pointers=0;
 
336
    free((unsigned char*) sort.record_pointers);
 
337
    sort.record_pointers=0;
338
338
  }
339
339
  if (full)
340
340
  {
341
 
    if (table->sort.sort_keys )
 
341
    if (sort.sort_keys )
342
342
    {
343
 
      if ((unsigned char*) table->sort.sort_keys)
344
 
        free((unsigned char*) table->sort.sort_keys);
345
 
      table->sort.sort_keys= 0;
 
343
      if ((unsigned char*) sort.sort_keys)
 
344
        free((unsigned char*) sort.sort_keys);
 
345
      sort.sort_keys= 0;
346
346
    }
347
 
    if (table->sort.buffpek)
 
347
    if (sort.buffpek)
348
348
    {
349
 
      if ((unsigned char*) table->sort.buffpek)
350
 
        free((unsigned char*) table->sort.buffpek);
351
 
      table->sort.buffpek= 0;
352
 
      table->sort.buffpek_len= 0;
 
349
      if ((unsigned char*) sort.buffpek)
 
350
        free((unsigned char*) sort.buffpek);
 
351
      sort.buffpek= 0;
 
352
      sort.buffpek_len= 0;
353
353
    }
354
354
  }
355
 
  if (table->sort.addon_buf)
 
355
  if (sort.addon_buf)
356
356
  {
357
 
    free((char *) table->sort.addon_buf);
358
 
    free((char *) table->sort.addon_field);
359
 
    table->sort.addon_buf=0;
360
 
    table->sort.addon_field=0;
 
357
    free((char *) sort.addon_buf);
 
358
    free((char *) sort.addon_field);
 
359
    sort.addon_buf=0;
 
360
    sort.addon_field=0;
361
361
  }
362
362
}
363
363