Commit 5e53947d authored by unknown's avatar unknown
Browse files

post-merge fix

parent 7b0069ee

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ void Item_param::set_time(TIME *tm, timestamp_type type, uint32 max_length_arg) 
  {

    char buff[MAX_DATE_STRING_REP_LENGTH];

    uint length= my_TIME_to_str(&value.time, buff);

    make_truncated_value_warning(current_thd, buff, length, type);

    make_truncated_value_warning(current_thd, buff, length, type, 0);

    set_zero_time(&value.time, MYSQL_TIMESTAMP_ERROR);

  }