cherry pick pingcap#27244 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Aug 20, 2021 · b58c62c · b58c62c
1 parent dbc8017
commit b58c62c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -4951,6 +4951,16 @@ func (s *testSuiteP2) TestAddDateBuiltinWithWarnings(c *C) {
  tk.MustQuery("show warnings").Check(testutil.RowsWithSep("|", "Warning|1292|Incorrect datetime value: '2001-01-00'"))
 }
 
+func (s *testSuiteP2) TestIssue27232(c *C) {
+ tk := testkit.NewTestKit(c, s.store)
+ tk.MustExec("use test")
+ tk.MustExec("drop table if exists t")
+ tk.MustExec("create table t (a timestamp)")
+ tk.MustExec("insert into t values (\"1970-07-23 10:04:59\"), (\"2038-01-19 03:14:07\")")
+ tk.MustQuery("select * from t where date_sub(a, interval 10 month) = date_sub(\"1970-07-23 10:04:59\", interval 10 month)").Check(testkit.Rows("1970-07-23 10:04:59"))
+ tk.MustQuery("select * from t where timestampadd(hour, 1, a ) = timestampadd(hour, 1, \"2038-01-19 03:14:07\")").Check(testkit.Rows("2038-01-19 03:14:07"))
+}
+
 func (s *testSuiteP2) TestStrToDateBuiltinWithWarnings(c *C) {
  tk := testkit.NewTestKit(c, s.store)
  tk.MustExec("set @@sql_mode='NO_ZERO_DATE'")

diff --git a/expression/builtin_time.go b/expression/builtin_time.go
@@ -3348,6 +3348,16 @@ func (c *addDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
  if err != nil {
  return nil, err
  }
+ if dateEvalTp == types.ETDatetime && args[0].GetType().Tp == mysql.TypeTimestamp {
+ tp := types.NewFieldType(mysql.TypeDatetime)
+ tp.Decimal = args[0].GetType().Decimal
+ tp.Flen = mysql.MaxDatetimeWidthNoFsp
+ if tp.Decimal > 0 {
+ tp.Flen = tp.Flen + 1 + tp.Decimal
+ }
+ types.SetBinChsClnFlag(tp)
+ args[0] = BuildCastFunction(ctx, args[0], tp)
+ }
  bf.tp.Flen, bf.tp.Decimal = mysql.MaxDatetimeFullWidth, types.UnspecifiedLength
  }
 
@@ -4022,6 +4032,16 @@ func (c *subDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
  if err != nil {
  return nil, err
  }
+ if dateEvalTp == types.ETDatetime && args[0].GetType().Tp == mysql.TypeTimestamp {
+ tp := types.NewFieldType(mysql.TypeDatetime)
+ tp.Decimal = args[0].GetType().Decimal
+ tp.Flen = mysql.MaxDatetimeWidthNoFsp
+ if tp.Decimal > 0 {
+ tp.Flen = tp.Flen + 1 + tp.Decimal
+ }
+ types.SetBinChsClnFlag(tp)
+ args[0] = BuildCastFunction(ctx, args[0], tp)
+ }
  bf.tp.Flen, bf.tp.Decimal = mysql.MaxDatetimeFullWidth, types.UnspecifiedLength
  }