diff --git a/expression/integration_test/integration_test.go b/expression/integration_test/integration_test.go index a43931e417ea0..044743153b780 100644 --- a/expression/integration_test/integration_test.go +++ b/expression/integration_test/integration_test.go @@ -7824,7 +7824,7 @@ func TestIfFunctionWithNull(t *testing.T) { testkit.Rows("20000 35100")) } -func TestIssue41733(t *testing.T) { +func TestIssue41733AndIssue45410(t *testing.T) { store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) tk.MustExec("create database testIssue41733") @@ -7855,4 +7855,14 @@ func TestIssue41733(t *testing.T) { tk.MustExec("INSERT IGNORE INTO t_big(c0) VALUES (1E20)") tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1264 Out of range value for column 'c0' at row 1")) tk.MustQuery("select * from t_big;").Check(testkit.Rows("18446744073709551615")) + + // Issue 45410 + tk.MustExec("create database testIssue45410") + defer tk.MustExec("drop database testIssue45410") + tk.MustExec("use testIssue45410") + + tk.MustExec("DROP TABLE IF EXISTS t1;") + tk.MustExec("CREATE TABLE t1 (c1 TINYINT(1) UNSIGNED NOT NULL );") + tk.MustExec("INSERT INTO t1 VALUES (0);") + tk.MustQuery("SELECT c1>=CAST('-787360724' AS TIME) FROM t1;").Check(testkit.Rows("1")) } diff --git a/types/datum.go b/types/datum.go index e4978293f79d2..ae752c786e993 100644 --- a/types/datum.go +++ b/types/datum.go @@ -1216,9 +1216,10 @@ func (d *Datum) convertToUint(sc *stmtctx.StatementContext, target *FieldType) ( case KindMysqlDuration: dec := d.GetMysqlDuration().ToNumber() err = dec.Round(dec, 0, ModeHalfUp) - ival, err1 := dec.ToInt() - if err1 == nil { - val, err = ConvertIntToUint(sc, ival, upperBound, tp) + var err1 error + val, err1 = ConvertDecimalToUint(sc, dec, upperBound, tp) + if err == nil { + err = err1 } case KindMysqlDecimal: val, err = ConvertDecimalToUint(sc, d.GetMysqlDecimal(), upperBound, tp)