← 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 02:36:12 UTC
  • mfrom: (1253 build)
  • mto: (1253.2.3 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1258.
  • Revision ID: mordred@inaugust.com-20091225023612-7hekryz87dtus3ph
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_alloc.cc
24
24
#include "drizzled/sql_alloc.h"
25
25
#include "drizzled/current_session.h"
26
26
#include "drizzled/error.h"
 
27
#include "drizzled/definitions.h"
 
28
 
 
29
#include "drizzled/internal/my_sys.h"
27
30
 
28
31
extern "C" void sql_alloc_error_handler(void);
29
32
 
85
88
  return pos;
86
89
}
87
90
 
 
91
void *Sql_alloc::operator new(size_t size)
 
92
{
 
93
  return sql_alloc(size);
 
94
}
 
95
 
 
96
void *Sql_alloc::operator new[](size_t size)
 
97
{
 
98
  return sql_alloc(size);
 
99
}
 
100
 
 
101
void *Sql_alloc::operator new[](size_t size, MEM_ROOT *mem_root)
 
102
{
 
103
  return alloc_root(mem_root, size);
 
104
}
 
105
 
 
106
void *Sql_alloc::operator new(size_t size, MEM_ROOT *mem_root)
 
107
{
 
108
  return alloc_root(mem_root, size);
 
109
}