expression: fix last_day incompatible with mysql (#11704)

pingcap · Aug 10, 2019 · ff71c0c · ff71c0c
1 parent 4995fe7
commit ff71c0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/expression/builtin_time.go b/expression/builtin_time.go
@@ -6416,14 +6416,13 @@ func (b *builtinLastDaySig) evalTime(row chunk.Row) (types.Time, bool, error) {
 		return types.Time{}, true, handleInvalidTimeError(b.ctx, err)
 	}
 	tm := arg.Time
-	var day int
-	year, month := tm.Year(), tm.Month()
-	if month == 0 {
+	year, month, day := tm.Year(), tm.Month(), tm.Day()
+	if month == 0 || day == 0 {
 		return types.Time{}, true, handleInvalidTimeError(b.ctx, types.ErrIncorrectDatetimeValue.GenWithStackByArgs(arg.String()))
 	}
-	day = types.GetLastDay(year, month)
+	lastDay := types.GetLastDay(year, month)
 	ret := types.Time{
-		Time: types.FromDate(year, month, day, 0, 0, 0, 0),
+		Time: types.FromDate(year, month, lastDay, 0, 0, 0, 0),
 		Type: mysql.TypeDate,
 		Fsp:  types.DefaultFsp,
 	}

diff --git a/expression/builtin_time_test.go b/expression/builtin_time_test.go
@@ -2676,6 +2676,7 @@ func (s *testEvaluatorSuite) TestLastDay(c *C) {
 		"2007-10-07 23:59:61",
 		"2005-00-00",
 		"2005-00-01",
+		"2243-01 00:00:00",
 		123456789}
 
 	for _, i := range testsNull {