← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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