← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Brian Aker
  • Date: 2010-07-16 19:54:08 UTC
  • mfrom: (1660.1.4 rollup)
  • Revision ID: brian@gaz-20100716195408-8fiuxwmy4mpqq4ko
Rollup patch + fix for not intel processors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
69
69
 
70
70
  /* Fix if the original table had 4 byte pointer blobs */
71
71
  if (flags & BLOB_FLAG)
72
 
    pack_length= (pack_length - old_field->table->getShare()->blob_ptr_size + portable_sizeof_char_ptr);
 
72
    pack_length= (pack_length - old_field->getTable()->getShare()->blob_ptr_size + portable_sizeof_char_ptr);
73
73
 
74
74
  switch (sql_type) 
75
75
  {
97
97
  if (!(flags & (NO_DEFAULT_VALUE_FLAG )) &&
98
98
      old_field->ptr && orig_field &&
99
99
      (sql_type != DRIZZLE_TYPE_TIMESTAMP ||                /* set def only if */
100
 
       old_field->table->timestamp_field != old_field ||  /* timestamp field */
 
100
       old_field->getTable()->timestamp_field != old_field ||  /* timestamp field */
101
101
       unireg_check == Field::TIMESTAMP_UN_FIELD))        /* has default val */
102
102
  {
103
103
    ptrdiff_t diff;
104
104
 
105
105
    /* Get the value from default_values */
106
 
    diff= (ptrdiff_t) (orig_field->table->getDefaultValues() - orig_field->table->record[0]);
 
106
    diff= (ptrdiff_t) (orig_field->getTable()->getDefaultValues() - orig_field->getTable()->record[0]);
107
107
    orig_field->move_field_offset(diff);        // Points now at default_values
108
108
    if (! orig_field->is_real_null())
109
109
    {