← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.cc

  • Committer: Monty Taylor
  • Date: 2010-06-20 03:22:53 UTC
  • mfrom: (1618.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1629.
  • Revision ID: mordred@inaugust.com-20100620032253-dyee0nb0195lnakd
Merged in constification of TableIdentifier from Brian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/default_value.cc
69
69
    goto error;
70
70
  memcpy(def_field, field_arg->field, field_arg->field->size_of());
71
71
  def_field->move_field_offset((ptrdiff_t)
72
 
                               (def_field->getTable()->getDefaultValues() - def_field->getTable()->record[0]));
 
72
                               (def_field->table->getDefaultValues() - def_field->table->record[0]));
73
73
  set_field(def_field);
74
74
  return false;
75
75
 
106
106
      }
107
107
 
108
108
      {
109
 
        push_warning_printf(field_arg->getTable()->in_use,
 
109
        push_warning_printf(field_arg->table->in_use,
110
110
                            DRIZZLE_ERROR::WARN_LEVEL_WARN,
111
111
                            ER_NO_DEFAULT_FOR_FIELD,
112
112
                            ER(ER_NO_DEFAULT_FOR_FIELD),