← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.cc

  • Committer: Paul McCullagh
  • Date: 2010-05-26 10:17:56 UTC
  • mto: (1567.1.3 new-staging)
  • mto: This revision was merged to the branch mainline in revision 1568.
  • Revision ID: paul.mccullagh@primebase.org-20100526101756-3qdwb9id3qhog0z1
Adjust for namespace changes

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