~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_imerge.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:19:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622141944-na0vb0uv30n6u55z
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
    uint32_t old_size= sizeof(optimizer::SEL_TREE**) * old_elements;
49
49
    uint32_t new_size= old_size * realloc_ratio;
50
50
    optimizer::SEL_TREE **new_trees= NULL;
51
 
    if (! (new_trees= (optimizer::SEL_TREE**) param->mem_root->alloc_root(new_size)))
52
 
      return -1;
 
51
    new_trees= (optimizer::SEL_TREE**) param->mem_root->alloc(new_size);
53
52
    memcpy(new_trees, trees, old_size);
54
53
    trees= new_trees;
55
54
    trees_next= trees + old_elements;
56
55
    trees_end= trees + old_elements * realloc_ratio;
57
56
  }
58
57
  *(trees_next++)= tree;
59
 
  return 0;
 
58
  return 0; // return void
60
59
}
61
60
 
62
61