From 6acafa9e0a799b542aae5796c134dc7a2fd574dc Mon Sep 17 00:00:00 2001 From: Yuanjia Zhang Date: Mon, 21 Aug 2023 20:36:34 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #46271 Signed-off-by: ti-chi-bot --- pkg/executor/index_lookup_join_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/executor/index_lookup_join_test.go b/pkg/executor/index_lookup_join_test.go index 6e0d8e939535e..7cbe41467bbc1 100644 --- a/pkg/executor/index_lookup_join_test.go +++ b/pkg/executor/index_lookup_join_test.go @@ -192,7 +192,11 @@ func TestInapplicableIndexJoinHint(t *testing.T) { query := `select /*+ tidb_inlj(bb) */ aa.* from (select * from t1) as aa left join (select t2.a, t2.a*2 as a2 from t2) as bb on aa.a=bb.a;` +<<<<<<< HEAD:pkg/executor/index_lookup_join_test.go tk.MustHavePlan(query, "IndexJoin") +======= + tk.HasPlan(query, "IndexJoin") +>>>>>>> 0c3bbc127c8 (planner: fix the issue that TIDB_INLJ hint cannot take effect when left joining two sub-queries (#46271)):executor/index_lookup_join_test.go } func TestIndexJoinOverflow(t *testing.T) { From 2131ad8351436b2a530a47e527f3269483dd43ef Mon Sep 17 00:00:00 2001 From: qw4990 Date: Mon, 19 Feb 2024 21:12:47 +0800 Subject: [PATCH 2/2] fixup --- pkg/executor/index_lookup_join_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/executor/index_lookup_join_test.go b/pkg/executor/index_lookup_join_test.go index 7cbe41467bbc1..b77c8646658df 100644 --- a/pkg/executor/index_lookup_join_test.go +++ b/pkg/executor/index_lookup_join_test.go @@ -192,11 +192,7 @@ func TestInapplicableIndexJoinHint(t *testing.T) { query := `select /*+ tidb_inlj(bb) */ aa.* from (select * from t1) as aa left join (select t2.a, t2.a*2 as a2 from t2) as bb on aa.a=bb.a;` -<<<<<<< HEAD:pkg/executor/index_lookup_join_test.go - tk.MustHavePlan(query, "IndexJoin") -======= tk.HasPlan(query, "IndexJoin") ->>>>>>> 0c3bbc127c8 (planner: fix the issue that TIDB_INLJ hint cannot take effect when left joining two sub-queries (#46271)):executor/index_lookup_join_test.go } func TestIndexJoinOverflow(t *testing.T) {