← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • 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:
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,