Commit ef92a390 authored by unknown's avatar unknown
Browse files

Fixed small bug in handling of pre-4.1 TIMESTAMP columns which was 

introduced during implementation of TIMESTAMP columns, which are able 
to store NULLs (Unfortunately it is impossible to write test case for
this. Kudos to Holyfoot for noticing it!)


sql/field.cc:
  Field_timestamp::get_auto_set_type(): To preserve compatibility 
  with pre-4.1 we have to handle TIMESTAMP_OLD_FIELD columns properly. 
  (It is ok to handle them as TIMESTAMP_DNUN_FIELD since value of first
   such column should be set to current timestamp on both INSERT and UPDATE
   operations, and we don't call this method for rest of them).
parent fdbc804c

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: