← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Patrick Crews
  • Date: 2010-08-19 23:23:15 UTC
  • mfrom: (1720.1.3 build)
  • Revision ID: gleebix@gmail.com-20100819232315-xcpbkwc5vz7kjhrp
Rollup patch - stewart's show create table patch + a couple of fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
94
94
  def= 0;
95
95
  char_length= length;
96
96
 
97
 
  if (!(flags & (NO_DEFAULT_VALUE_FLAG )) &&
 
97
  if (!(flags & (NO_DEFAULT_VALUE_FLAG)) &&
 
98
      !(flags & AUTO_INCREMENT_FLAG) &&
98
99
      old_field->ptr && orig_field &&
99
100
      (sql_type != DRIZZLE_TYPE_TIMESTAMP ||                /* set def only if */
100
101
       old_field->getTable()->timestamp_field != old_field ||  /* timestamp field */