This is an automated cherry-pick of pingcap#54067

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

expression/util_test.go

@@ -259,8 +259,13 @@ func TestSubstituteCorCol2Constant(t *testing.T) {
 	plus3 := newFunction(ast.Plus, plus2, col1)
 	ret, err = SubstituteCorCol2Constant(plus3)
 	require.NoError(t, err)
+<<<<<<< HEAD:expression/util_test.go
 	ans3 := newFunction(ast.Plus, ans1, col1)
 	require.True(t, ret.Equal(ctx, ans3))
+=======
+	ans3 := newFunctionWithMockCtx(ast.Plus, ans1, col1)
+	require.False(t, ret.Equal(ctx, ans3))
+>>>>>>> 1a24c032126 (expression: correct the erroneous scalar function equivalence check (#54067)):pkg/expression/util_test.go
 }
 
 func TestPushDownNot(t *testing.T) {

parser/types/field_type.go

@@ -263,8 +263,13 @@ func (ft *FieldType) Equal(other *FieldType) bool {
 	// When tp is float or double with decimal unspecified, do not check whether flen is equal,
 	// because flen for them is useless.
 	// The decimal field can be ignored if the type is int or string.
+<<<<<<< HEAD:parser/types/field_type.go
 	tpEqual := (ft.tp == other.tp) || (ft.tp == mysql.TypeVarchar && other.tp == mysql.TypeVarString) || (ft.tp == mysql.TypeVarString && other.tp == mysql.TypeVarchar)
 	flenEqual := ft.flen == other.flen || (ft.EvalType() == ETReal && ft.decimal == UnspecifiedLength)
+=======
+	tpEqual := (ft.GetType() == other.GetType()) || (ft.GetType() == mysql.TypeVarchar && other.GetType() == mysql.TypeVarString) || (ft.GetType() == mysql.TypeVarString && other.GetType() == mysql.TypeVarchar)
+	flenEqual := ft.flen == other.flen || (ft.EvalType() == ETReal && ft.decimal == UnspecifiedLength) || ft.EvalType() == ETJson
+>>>>>>> 1a24c032126 (expression: correct the erroneous scalar function equivalence check (#54067)):pkg/parser/types/field_type.go
 	ignoreDecimal := ft.EvalType() == ETInt || ft.EvalType() == ETString
 	partialEqual := tpEqual &&
 		(ignoreDecimal || ft.decimal == other.decimal) &&