← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Brian Aker
  • Date: 2010-04-19 17:51:52 UTC
  • Revision ID: brian@gaz-20100419175152-lar9fncw9vhhav0d
Updates to confine memroot

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
258
258
    return memory::sql_alloc(size);
259
259
  }
260
260
  static void *operator new(size_t size, memory::Root *mem_root)
261
 
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
 
261
  { return (void*) mem_root->alloc_root((uint32_t) size); }
262
262
  static void operator delete(void *, size_t)
263
263
  {  }
264
264
  static void operator delete(void *, memory::Root *)