diff --git a/sessionctx/stmtctx/BUILD.bazel b/sessionctx/stmtctx/BUILD.bazel
index b42939f7ec324..a2e12d1e860e1 100644
--- a/sessionctx/stmtctx/BUILD.bazel
+++ b/sessionctx/stmtctx/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/sessionctx/stmtctx",
     visibility = ["//visibility:public"],
     deps = [
+        "//errno",
         "//parser",
         "//parser/ast",
         "//parser/model",
diff --git a/sessionctx/stmtctx/stmtctx.go b/sessionctx/stmtctx/stmtctx.go
index 3009cc085be28..9a49c24851c08 100644
--- a/sessionctx/stmtctx/stmtctx.go
+++ b/sessionctx/stmtctx/stmtctx.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/errno"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/parser/ast"
 	"github.com/pingcap/tidb/parser/model"
@@ -868,10 +869,15 @@ func (sc *StatementContext) HandleTruncate(err error) error {
 
 	err = errors.Cause(err)
 	if e, ok := err.(*errors.Error); !ok ||
-		(e.Code() != mysql.ErrTruncatedWrongValue &&
-			e.Code() != mysql.ErrDataTooLong &&
-			e.Code() != mysql.ErrTruncatedWrongValueForField &&
-			e.Code() != mysql.WarnDataTruncated) {
+		(e.Code() != errno.ErrTruncatedWrongValue &&
+			e.Code() != errno.ErrDataTooLong &&
+			e.Code() != errno.ErrTruncatedWrongValueForField &&
+			e.Code() != errno.ErrWarnDataOutOfRange &&
+			e.Code() != errno.ErrDataOutOfRange &&
+			e.Code() != errno.ErrBadNumber &&
+			e.Code() != errno.ErrWrongValueForType &&
+			e.Code() != errno.ErrDatetimeFunctionOverflow &&
+			e.Code() != errno.WarnDataTruncated) {
 		return err
 	}
 
diff --git a/table/column.go b/table/column.go
index 0a80ddae4e8d4..c63febe75b0ba 100644
--- a/table/column.go
+++ b/table/column.go
@@ -323,6 +323,7 @@ func CastValue(ctx sessionctx.Context, val types.Datum, col *model.ColumnInfo, r
 	}
 
 	err = sc.HandleTruncate(err)
+	err = sc.HandleOverflow(err, err)
 
 	if forceIgnoreTruncate {
 		err = nil