← 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 19:23:14 UTC
  • Revision ID: brian@gaz-20100419192314-47vro57tcn607i61
More updates for memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tree.cc
127
127
  }
128
128
  if (! (tree->with_delete= with_delete))
129
129
  {
130
 
    init_alloc_root(&tree->mem_root, default_alloc_size);
 
130
    tree->mem_root.init_alloc_root(default_alloc_size);
131
131
    tree->mem_root.min_malloc= (sizeof(TREE_ELEMENT)+tree->size_of_element);
132
132
  }
133
133
}
148
148
        if (tree->memory_limit)
149
149
          (*tree->free)(NULL, free_end, tree->custom_arg);
150
150
      }
151
 
      free_root(&tree->mem_root, free_flags);
 
151
      tree->mem_root.free_root(free_flags);
152
152
    }
153
153
  }
154
154
  tree->root= &tree->null_element;