← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • 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/field.cc
612
612
 
613
613
void *Field::operator new(size_t size, memory::Root *mem_root)
614
614
{
615
 
  return mem_root->alloc_root(static_cast<uint32_t>(size));
 
615
  return mem_root->alloc(size);
616
616
}
617
617
 
618
618
enum_field_types Field::field_type_merge(enum_field_types a,