← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • 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/field.cc
373
373
 
374
374
void *Field::operator new(size_t size, memory::Root *mem_root)
375
375
{
376
 
  return alloc_root(mem_root, static_cast<uint32_t>(size));
 
376
  return mem_root->alloc_root(static_cast<uint32_t>(size));
377
377
}
378
378
 
379
379
enum_field_types Field::field_type_merge(enum_field_types a,