← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

Merged from PatG.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
616
616
      We mark first TIMESTAMP field with NOW() in DEFAULT or ON UPDATE 
617
617
      as auto-update field.
618
618
    */
619
 
    if (field->sql_type == FIELD_TYPE_TIMESTAMP &&
 
619
    if (field->sql_type == DRIZZLE_TYPE_TIMESTAMP &&
620
620
        MTYP_TYPENR(field->unireg_check) != Field::NONE &&
621
621
        !time_stamp_pos)
622
622
      time_stamp_pos= (uint) field->offset+ (uint) data_offset + 1;
969
969
        goto err;
970
970
      }
971
971
    }
972
 
    else if (regfield->real_type() == FIELD_TYPE_ENUM &&
 
972
    else if (regfield->real_type() == DRIZZLE_TYPE_ENUM &&
973
973
             (field->flags & NOT_NULL_FLAG))
974
974
    {
975
975
      regfield->set_notnull();