fixup

pingcap · Jan 28, 2023 · 339f759 · 339f759
1 parent 0339ad3
commit 339f759
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/executor/explainfor_test.go b/executor/explainfor_test.go
@@ -949,7 +949,7 @@ func TestIndexMerge4PlanCache(t *testing.T) {
 	tk.MustExec("set @a=9, @b=10, @c=11;")
 	tk.MustQuery("execute stmt using @a, @a;").Check(testkit.Rows("10 10 10"))
 	tk.MustQuery("execute stmt using @a, @c;").Check(testkit.Rows("10 10 10", "11 11 11"))
-	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("1"))
+	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("0"))
 	tk.MustQuery("execute stmt using @c, @a;").Check(testkit.Rows("10 10 10"))
 	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("1"))
 

diff --git a/planner/core/cacheable_checker_test.go b/planner/core/cacheable_checker_test.go
@@ -38,7 +38,6 @@ func TestIssue40224(t *testing.T) {
 	tk.MustExec("prepare st from 'select a from t where a in (?, ?)'")
 	tk.MustExec("set @a=1.0, @b=2.0")
 	tk.MustExec("execute st using @a, @b")
-	tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1105 skip plan-cache: '1.0' may be converted to INT"))
 	tk.MustExec("execute st using @a, @b")
 	tkProcess := tk.Session().ShowProcess()
 	ps := []*util.ProcessInfo{tkProcess}

diff --git a/planner/core/prepare_test.go b/planner/core/prepare_test.go
@@ -1583,7 +1583,7 @@ func TestIssue29303(t *testing.T) {
 	tk.MustQuery(`execute stmt using @a,@b,@c,@d`).Check(testkit.Rows())
 	tk.MustExec(`set @a="龂", @b="龂", @c="龂", @d="龂"`)
 	tk.MustQuery(`execute stmt using @a,@b,@c,@d`).Check(testkit.Rows("� 龂 � 龂"))
-	tk.MustQuery(`select @@last_plan_from_cache`).Check(testkit.Rows("0"))
+	tk.MustQuery(`select @@last_plan_from_cache`).Check(testkit.Rows("1"))
 }
 
 func TestIssue34725(t *testing.T) {