← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_alloc.cc

  • Committer: Monty Taylor
  • Date: 2009-12-25 08:50:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091225085015-83sux5qsvy312gew
MEM_ROOT == memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_alloc.cc
28
28
 
29
29
#include "drizzled/internal/my_sys.h"
30
30
 
 
31
using namespace drizzled;
 
32
 
31
33
extern "C" void sql_alloc_error_handler(void);
32
34
 
33
35
extern "C" void sql_alloc_error_handler(void)
35
37
  errmsg_printf(ERRMSG_LVL_ERROR, "%s",ER(ER_OUT_OF_RESOURCES));
36
38
}
37
39
 
38
 
void init_sql_alloc(MEM_ROOT *mem_root, size_t block_size, size_t)
 
40
void init_sql_alloc(memory::Root *mem_root, size_t block_size, size_t)
39
41
{
40
42
  init_alloc_root(mem_root, block_size);
41
43
  mem_root->error_handler= sql_alloc_error_handler;
44
46
 
45
47
void *sql_alloc(size_t Size)
46
48
{
47
 
  MEM_ROOT *root= current_mem_root();
 
49
  memory::Root *root= current_mem_root();
48
50
  return alloc_root(root,Size);
49
51
}
50
52
 
98
100
  return sql_alloc(size);
99
101
}
100
102
 
101
 
void *Sql_alloc::operator new[](size_t size, MEM_ROOT *mem_root)
 
103
void *Sql_alloc::operator new[](size_t size, memory::Root *mem_root)
102
104
{
103
105
  return alloc_root(mem_root, size);
104
106
}
105
107
 
106
 
void *Sql_alloc::operator new(size_t size, MEM_ROOT *mem_root)
 
108
void *Sql_alloc::operator new(size_t size, memory::Root *mem_root)
107
109
{
108
110
  return alloc_root(mem_root, size);
109
111
}