← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_alloc.h

  • Committer: Monty Taylor
  • Date: 2008-11-12 17:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 584.
  • Revision ID: monty@inaugust.com-20081112174240-l2vg9lnzbmjc3uyk
More header cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_alloc.h
22
22
 
23
23
#include <libdrizzle/net_serv.h>
24
24
#include <mysys/my_alloc.h>
 
25
#include <mystrings/m_ctype.h>
25
26
 
26
27
class Session;
27
28
 
59
60
  { return alloc_root(mem_root, size); }
60
61
  static void operator delete(void *ptr __attribute__((unused)),
61
62
                              size_t size __attribute__((unused)))
62
 
  { TRASH(ptr, size); }
 
63
  {  }
63
64
  static void operator delete(void *ptr __attribute__((unused)),
64
65
                              MEM_ROOT *mem_root __attribute__((unused)))
65
66
  { /* never called */ }
68
69
  { /* never called */ }
69
70
  static void operator delete[](void *ptr __attribute__((unused)),
70
71
                                size_t size __attribute__((unused)))
71
 
  { TRASH(ptr, size); }
 
72
  {  }
72
73
#ifdef HAVE_purify
73
74
  bool dummy;
74
75
  inline Sql_alloc() :dummy(0) {}