← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
234
234
    return memory::sql_alloc(size);
235
235
  }
236
236
  static void *operator new(size_t size, memory::Root *mem_root)
237
 
  { return (void*) mem_root->alloc_root((uint32_t) size); }
238
 
  static void operator delete(void *, size_t)
 
237
  { return mem_root->alloc(size); }
 
238
  static void operator delete(void*, size_t)
239
239
  {  }
240
 
  static void operator delete(void *, memory::Root *)
 
240
  static void operator delete(void*, memory::Root*)
241
241
  {}
242
242
  Select_Lex_Node(): linkage(UNSPECIFIED_TYPE) {}
243
243
  virtual ~Select_Lex_Node() {}