← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 22:39:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2348.
  • Revision ID: olafvdspek@gmail.com-20110622223931-z6r8g68zp401kkbe
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
4516
4516
  */
4517
4517
  if (!join->table_reexec)
4518
4518
  {
4519
 
    join->table_reexec= (Table**) join->session->mem.alloc(sizeof(Table*));
 
4519
    join->table_reexec= new (join->session->mem) Table*;
4520
4520
    if (join->tmp_join)
4521
4521
      join->tmp_join->table_reexec= join->table_reexec;
4522
4522
  }
5610
5610
 
5611
5611
  table_count= join->tables;
5612
5612
  stat= (JoinTable*) join->session->mem.calloc(sizeof(JoinTable)*table_count);
5613
 
  stat_ref= (JoinTable**) join->session->mem.alloc(sizeof(JoinTable*)*MAX_TABLES);
5614
 
  table_vector= (Table**) join->session->mem.alloc(sizeof(Table*)*(table_count*2));
5615
 
  // table_vector= new (join->session->mem) Table*[2 * table_count];
 
5613
  stat_ref= new (join->session->mem) JoinTable*[MAX_TABLES];
 
5614
  table_vector= new (join->session->mem) Table*[2 * table_count];
5616
5615
 
5617
5616
  join->best_ref=stat_vector;
5618
5617