executor: show warning for kill pid statement (pingcap#5210)

crazycs520 · Nov 29, 2017 · f49413e · f49413e
1 parent d8fa8ef
commit f49413e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/executor/simple.go b/executor/simple.go
@@ -294,6 +294,9 @@ func (e *SimpleExec) executeKillStmt(s *ast.KillStmt) error {
 			return nil
 		}
 		sm.Kill(s.ConnectionID, s.Query)
+	} else {
+		err := errors.New("Invalid operation. Please use 'KILL TIDB [CONNECTION | QUERY] connectionID' instead")
+		e.ctx.GetSessionVars().StmtCtx.AppendWarning(err)
 	}
 	return nil
 }

diff --git a/executor/simple_test.go b/executor/simple_test.go
@@ -203,6 +203,15 @@ func (s *testSuite) TestSetPwd(c *C) {
 	result.Check(testkit.Rows(auth.EncodePassword("pwd")))
 }
 
+func (s *testSuite) TestKillStmt(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("kill 1")
+
+	result := tk.MustQuery("show warnings")
+	result.Check(testkit.Rows("Warning 1105 Invalid operation. Please use 'KILL TIDB [CONNECTION | QUERY] connectionID' instead"))
+}
+
 func (s *testSuite) TestFlushPrivileges(c *C) {
 	// Global variables is really bad, when the test cases run concurrently.
 	save := privileges.Enable