This is an automated cherry-pick of pingcap#53716

Signed-off-by: ti-chi-bot <[email protected]>

Author: YangKeao

expression/util.go

@@ -487,7 +487,15 @@ func ColumnSubstituteImpl(expr Expression, schema *Schema, newExprs []Expression
 			}
 		}
 		if substituted {
+<<<<<<< HEAD:expression/util.go
 			return true, hasFail, NewFunctionInternal(v.GetCtx(), v.FuncName.L, v.RetType, refExprArr.Result()...)
+=======
+			newFunc, err := NewFunction(ctx, v.FuncName.L, v.RetType, refExprArr.Result()...)
+			if err != nil {
+				return true, true, v
+			}
+			return true, hasFail, newFunc
+>>>>>>> 3d68bd21240 (expression: fail `ColumnSubstituteImpl` if creating function returns error (#53716)):pkg/expression/util.go
 		}
 	}
 	return false, false, expr