fix test

Signed-off-by: ailinkid <314806019@qq.com>
pingcap · Dec 3, 2021 · 4a549e2 · 4a549e2
1 parent ffb94fc
commit 4a549e2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ddl/column.go b/ddl/column.go
@@ -1353,9 +1353,9 @@ func (w *updateColumnWorker) getRowRecord(handle kv.Handle, recordKey []byte, ra
 	w.sessCtx.GetSessionVars().StmtCtx.SetWarnings(oldWarn)
 	val := w.rowMap[w.oldColInfo.ID]
 	col := w.newColInfo
-	if val.Kind() == types.KindNull && col.FieldType.Tp == mysql.TypeTimestamp {
+	if val.Kind() == types.KindNull && col.FieldType.Tp == mysql.TypeTimestamp && mysql.HasNotNullFlag(col.Flag) {
 		if v, err := expression.GetTimeCurrentTimestamp(w.sessCtx, col.Tp, int8(col.Decimal)); err == nil {
-			// convert null value to timestamp should be substituted with current timestamp.
+			// convert null value to timestamp should be substituted with current timestamp if NOT_NULL flag is set.
 			w.rowMap[w.oldColInfo.ID] = v
 		}
 	}