← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.cc

  • Committer: Brian Aker
  • Date: 2010-11-22 00:16:44 UTC
  • mto: (1945.2.1 quick)
  • mto: This revision was merged to the branch mainline in revision 1947.
  • Revision ID: brian@tangent.org-20101122001644-pi6jv0d65e82xn38
Merge in lock refactor, this just encapsulates.

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->table->s->default_values -
73
 
                                def_field->table->record[0]));
 
72
                               (def_field->getTable()->getDefaultValues() - def_field->getTable()->record[0]));
74
73
  set_field(def_field);
75
74
  return false;
76
75
 
107
106
      }
108
107
 
109
108
      {
110
 
        push_warning_printf(field_arg->table->in_use,
 
109
        push_warning_printf(field_arg->getTable()->in_use,
111
110
                            DRIZZLE_ERROR::WARN_LEVEL_WARN,
112
111
                            ER_NO_DEFAULT_FOR_FIELD,
113
112
                            ER(ER_NO_DEFAULT_FOR_FIELD),