Commit 7d583c58 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/dlenev/src/mysql-4.1-bf


sql/field.cc:
  Auto merged
parents 28b0e7fe ef92a390

sql/field.cc

+8 −0
Original line number Diff line number Diff line
@@ -2970,6 +2970,14 @@ timestamp_auto_set_type Field_timestamp::get_auto_set_type() const 
    return TIMESTAMP_AUTO_SET_ON_INSERT;

  case TIMESTAMP_UN_FIELD:

    return TIMESTAMP_AUTO_SET_ON_UPDATE;

  case TIMESTAMP_OLD_FIELD:

    /*

      Altough we can have several such columns in legacy tables this

      function should be called only for first of them (i.e. the one

      having auto-set property).

    */

    DBUG_ASSERT(table->timestamp_field == this);

    /* Fall-through */

  case TIMESTAMP_DNUN_FIELD:

    return TIMESTAMP_AUTO_SET_ON_BOTH;

  default: