← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tree.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/tree.cc
229
229
    if (tree->with_delete)
230
230
      element= (TREE_ELEMENT *) malloc(alloc_size);
231
231
    else
232
 
      element= (TREE_ELEMENT *) alloc_root(&tree->mem_root,alloc_size);
 
232
      element= (TREE_ELEMENT *) tree->mem_root.alloc_root(alloc_size);
233
233
    if (!element)
234
234
      return(NULL);
235
235
    **parent= element;