Commit 48fe2802 authored by igor@olga.mysql.com's avatar igor@olga.mysql.com
Browse files

Post-merge fix.

parent 040e46fc
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -4054,7 +4054,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
    }
    bool save_abort_on_warning= thd->abort_on_warning;
    thd->abort_on_warning= TRUE;
    make_truncated_value_warning(thd, f_val, strlength(f_val), t_type,
    make_truncated_value_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
                                 f_val, strlength(f_val), t_type,
                                 new_datetime_field->field_name);
    thd->abort_on_warning= save_abort_on_warning;
  }