fix

pingcap · May 18, 2023 · 408c42e · 408c42e
1 parent d388b2d
commit 408c42e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/expression/builtin_cast.go b/expression/builtin_cast.go
@@ -1971,11 +1971,6 @@ func WrapWithCastAsInt(ctx sessionctx.Context, expr Expression) Expression {
 	tp.SetDecimal(0)
 	types.SetBinChsClnFlag(tp)
 	tp.AddFlag(expr.GetType().GetFlag() & mysql.UnsignedFlag)
-
-	if expr.GetType().GetType() == mysql.TypeNull {
-		tp.SetType(mysql.TypeLong)
-		tp.AddFlag(mysql.UnsignedFlag)
-	}
 	return BuildCastFunction(ctx, expr, tp)
 }
 

diff --git a/planner/core/rule_aggregation_push_down.go b/planner/core/rule_aggregation_push_down.go
@@ -538,6 +538,13 @@ func (a *aggregationPushDownSolver) aggPushDown(p LogicalPlan, opt *logicalOptim
 						newAggFuncsArgs = append(newAggFuncsArgs, newArgs)
 					}
 				}
+				for i, funcsArgs := range oldAggFuncsArgs {
+					for j := range funcsArgs {
+						if oldAggFuncsArgs[i][j].GetType().EvalType() != newAggFuncsArgs[i][j].GetType().EvalType() {
+							noSideEffects = false
+						}
+					}
+				}
 				if noSideEffects {
 					agg.GroupByItems = newGbyItems
 					for i, aggFunc := range agg.AggFuncs {