← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/insert_value.cc

  • Committer: Brian Aker
  • Date: 2010-07-16 05:40:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1661.
  • Revision ID: brian@gaz-20100716054008-cfcvyu0akpwqnwqd
Encapsulate Table in field

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/insert_value.cc
69
69
 
70
70
  Item_field *field_arg= (Item_field *)arg;
71
71
 
72
 
  if (field_arg->field->table->insert_values)
 
72
  if (field_arg->field->getTable()->insert_values)
73
73
  {
74
74
    Field *def_field= (Field*) memory::sql_alloc(field_arg->field->size_of());
75
75
    if (!def_field)
76
76
      return true;
77
77
    memcpy(def_field, field_arg->field, field_arg->field->size_of());
78
78
    def_field->move_field_offset((ptrdiff_t)
79
 
                                 (def_field->table->insert_values -
80
 
                                  def_field->table->record[0]));
 
79
                                 (def_field->getTable()->insert_values -
 
80
                                  def_field->getTable()->record[0]));
81
81
    set_field(def_field);
82
82
  }
83
83
  else
87
87
    tmp_field= new Field_null(0, 0, field_arg->field->field_name, &my_charset_bin);
88
88
    if (tmp_field)
89
89
    {
90
 
      tmp_field->init(field_arg->field->table);
 
90
      tmp_field->init(field_arg->field->getTable());
91
91
      set_field(tmp_field);
92
92
    }
93
93
  }