resolve conflict

expression/integration_test.go

@@ -9070,24 +9070,6 @@ func (s *testIntegrationSuite) TestVitessHashMatchesVitessShards(c *C) {
 	tk.MustQuery("select customer_id, id, hex(expected_shard), hex(computed_shard) from t where expected_shard <> computed_shard").
 		Check(testkit.Rows())
 }
-<<<<<<< HEAD
-=======
-
-func (s *testIntegrationSuite) TestIssue23925(c *C) {
-	defer s.cleanEnv(c)
-	tk := testkit.NewTestKit(c, s.store)
-
-	tk.MustExec("use test;")
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t(a int primary key, b set('Alice','Bob') DEFAULT NULL);")
-	tk.MustExec("insert into t value(1,'Bob');")
-	tk.MustQuery("select max(b) + 0 from t group by a;").Check(testkit.Rows("2"))
-
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t(a int, b set('Alice','Bob') DEFAULT NULL);")
-	tk.MustExec("insert into t value(1,'Bob');")
-	tk.MustQuery("select max(b) + 0 from t group by a;").Check(testkit.Rows("2"))
-}
 
 func (s *testIntegrationSuite) TestIssue23889(c *C) {
 	defer s.cleanEnv(c)
@@ -9102,4 +9084,3 @@ func (s *testIntegrationSuite) TestIssue23889(c *C) {
 	tk.MustQuery("SELECT ( test_decimal . `col_decimal` , test_decimal . `col_decimal` )  IN ( select * from test_t ) as field1 FROM  test_decimal;").Check(
 		testkit.Rows("<nil>", "0"))
 }
->>>>>>> 07d2b840d... expression: don't propagateColumnEQ joinCondition when nullSensitive (#23989)