← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Brian Aker
  • Date: 2009-08-05 07:19:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1111.
  • Revision ID: brian@gaz-20090805071917-ukm39wpvfesxthiz
More Table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
1109
1109
  {
1110
1110
    exec_tmp_table1->file->extra(HA_EXTRA_RESET_STATE);
1111
1111
    exec_tmp_table1->file->ha_delete_all_rows();
1112
 
    free_io_cache(exec_tmp_table1);
1113
 
    filesort_free_buffers(exec_tmp_table1,0);
 
1112
    exec_tmp_table1->free_io_cache();
 
1113
    exec_tmp_table1->filesort_free_buffers();
1114
1114
  }
1115
1115
  if (exec_tmp_table2)
1116
1116
  {
1117
1117
    exec_tmp_table2->file->extra(HA_EXTRA_RESET_STATE);
1118
1118
    exec_tmp_table2->file->ha_delete_all_rows();
1119
 
    free_io_cache(exec_tmp_table2);
1120
 
    filesort_free_buffers(exec_tmp_table2,0);
 
1119
    exec_tmp_table2->free_io_cache();
 
1120
    exec_tmp_table2->filesort_free_buffers();
1121
1121
  }
1122
1122
  if (items0)
1123
1123
    set_items_ref_array(items0);
1858
1858
    */
1859
1859
    if (tables > const_tables) // Test for not-const tables
1860
1860
    {
1861
 
      free_io_cache(table[const_tables]);
1862
 
      filesort_free_buffers(table[const_tables],full);
 
1861
      table[const_tables]->free_io_cache();
 
1862
      table[const_tables]->filesort_free_buffers(full);
1863
1863
    }
1864
1864
 
1865
1865
    if (full)
5524
5524
           offset(entry->record[0]) : 0);
5525
5525
  reclength= entry->s->reclength-offset;
5526
5526
 
5527
 
  free_io_cache(entry);                         // Safety
 
5527
  entry->free_io_cache();                               // Safety
5528
5528
  entry->file->info(HA_STATUS_VARIABLE);
5529
5529
  if (entry->s->db_type() == heap_engine ||
5530
5530
      (!entry->s->blob_fields &&