fixup

pingcap · Aug 21, 2023 · 19b47ab · 19b47ab
1 parent 8aaa96b
commit 19b47ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/executor/index_lookup_join_test.go b/executor/index_lookup_join_test.go
@@ -183,6 +183,16 @@ func TestInapplicableIndexJoinHint(t *testing.T) {
 	tk.MustQuery(`show warnings;`).Check(testkit.Rows(`Warning 1815 Optimizer Hint /*+ INL_MERGE_JOIN(t1) */ is inapplicable`))
 	tk.MustQuery(`select /*+ INL_MERGE_JOIN(t2) */ * from t1 right join t2 on t1.a=t2.a;`).Check(testkit.Rows())
 	tk.MustQuery(`show warnings;`).Check(testkit.Rows(`Warning 1815 Optimizer Hint /*+ INL_MERGE_JOIN(t2) */ is inapplicable`))
+
+	// Test for issues/46160
+	tk.MustExec(`drop table if exists t1, t2;`)
+	tk.MustExec("use test")
+	tk.MustExec(`create table t1 (a int, key(a))`)
+	tk.MustExec(`create table t2 (a int, key(a))`)
+
+	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;`
+	tk.HasPlan(query, "IndexJoin")
 }
 
 func TestIndexJoinOverflow(t *testing.T) {

diff --git a/planner/core/casetest/hint/hint_test.go b/planner/core/casetest/hint/hint_test.go
@@ -647,16 +647,3 @@ func TestInvalidHint(t *testing.T) {
 		tk.MustQuery(tt).Check(testkit.Rows(output[i].Plan...))
 	}
 }
-
-func TestIssue46160(t *testing.T) {
-	store := testkit.CreateMockStore(t)
-	tk := testkit.NewTestKit(t, store)
-
-	tk.MustExec("use test")
-	tk.MustExec(`create table t1 (a int, key(a))`)
-	tk.MustExec(`create table t2 (a int, key(a))`)
-
-	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;`
-	tk.HasPlan(query, "IndexJoin")
-}