← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/my_tree.cc

  • Committer: Monty Taylor
  • Date: 2009-12-29 18:26:43 UTC
  • mfrom: (1257 build)
  • mto: This revision was merged to the branch mainline in revision 1258.
  • Revision ID: mordred@inaugust.com-20091229182643-bv3c4va7rit6wmvl
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/my_tree.cc
60
60
#include "drizzled/internal/m_string.h"
61
61
#include "drizzled/memory/root.h"
62
62
 
 
63
using namespace drizzled;
 
64
 
63
65
#define BLACK           1
64
66
#define RED             0
65
67
#define DEFAULT_ALLOC_SIZE 8192
123
125
  }
124
126
  if (! (tree->with_delete= with_delete))
125
127
  {
126
 
    init_alloc_root(&tree->mem_root, default_alloc_size, 0);
 
128
    init_alloc_root(&tree->mem_root, default_alloc_size);
127
129
    tree->mem_root.min_malloc= (sizeof(TREE_ELEMENT)+tree->size_of_element);
128
130
  }
129
131
}
160
162
void reset_tree(TREE* tree)
161
163
{
162
164
  /* do not free mem_root, just mark blocks as free */
163
 
  free_tree(tree, MYF(MY_MARK_BLOCKS_FREE));
 
165
  free_tree(tree, MYF(memory::MARK_BLOCKS_FREE));
164
166
}
165
167
 
166
168