← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_imerge.cc

  • Committer: Brian Aker
  • Date: 2010-04-19 17:51:52 UTC
  • Revision ID: brian@gaz-20100419175152-lar9fncw9vhhav0d
Updates to confine memroot

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sel_imerge.cc
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**) alloc_root(param->mem_root, new_size)))
 
51
    if (! (new_trees= (optimizer::SEL_TREE**) param->mem_root->alloc_root(new_size)))
52
52
      return -1;
53
53
    memcpy(new_trees, trees, old_size);
54
54
    trees= new_trees;