expression: fix last_day function (#9750)

pingcap · Mar 23, 2019 · 6f0129f · 6f0129f
1 parent 8da8632
commit 6f0129f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/expression/builtin_time.go b/expression/builtin_time.go
@@ -5583,9 +5583,10 @@ func (b *builtinLastDaySig) evalTime(row chunk.Row) (types.Time, bool, error) {
 		return types.Time{}, true, errors.Trace(handleInvalidTimeError(b.ctx, err))
 	}
 	tm := arg.Time
-	year, month, day := tm.Year(), tm.Month(), 30
-	if year == 0 && month == 0 && tm.Day() == 0 {
-		return types.Time{}, true, errors.Trace(handleInvalidTimeError(b.ctx, types.ErrIncorrectDatetimeValue.GenWithStackByArgs(arg.String())))
+	var day int
+	year, month := tm.Year(), tm.Month()
+	if month == 0 {
+		return types.Time{}, true, handleInvalidTimeError(b.ctx, types.ErrIncorrectDatetimeValue.GenWithStackByArgs(arg.String()))
 	}
 	day = types.GetLastDay(year, month)
 	ret := types.Time{

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