~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:19:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622141944-na0vb0uv30n6u55z
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 (void*) 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() {}