← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/tree.cc

  • Committer: Brian Aker
  • Date: 2008-12-09 17:33:02 UTC
  • mfrom: (656.1.54 devel)
  • Revision ID: brian@tangent.org-20081209173302-aptngvc7efxnatnt
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/tree.cc
218
218
 
219
219
    key_size+=tree->size_of_element;
220
220
    if (tree->with_delete)
221
 
      element=(TREE_ELEMENT *) my_malloc(alloc_size, MYF(MY_WME));
 
221
      element=(TREE_ELEMENT *) malloc(alloc_size);
222
222
    else
223
223
      element=(TREE_ELEMENT *) alloc_root(&tree->mem_root,alloc_size);
224
224
    if (!element)