← 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 19:23:14 UTC
  • Revision ID: brian@gaz-20100419192314-47vro57tcn607i61
More updates for memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
811
811
Field *Field::new_field(memory::Root *root, Table *new_table, bool)
812
812
{
813
813
  Field *tmp;
814
 
  if (!(tmp= (Field*) memdup_root(root,(char*) this,size_of())))
 
814
  if (!(tmp= (Field*) root->memdup_root((char*) this,size_of())))
815
815
    return 0;
816
816
 
817
817
  if (tmp->table->maybe_null)
844
844
Field *Field::clone(memory::Root *root, Table *new_table)
845
845
{
846
846
  Field *tmp;
847
 
  if ((tmp= (Field*) memdup_root(root,(char*) this,size_of())))
 
847
  if ((tmp= (Field*) root->memdup_root((char*) this,size_of())))
848
848
  {
849
849
    tmp->init(new_table);
850
850
    tmp->move_field_offset((ptrdiff_t) (new_table->record[0] -