From 9739b7a6af3d48c6227d7766ccd98a697b1a6ac0 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Fri, 18 Mar 2005 16:17:10 -0800
Subject: [PATCH] Fix 'kill' test to actually test that the connection has been
 killed.

mysql-test/r/kill.result:
  Update results
mysql-test/t/kill.test:
  Fix 'ping' to be '--ping' and make test that this is a new
  connection actually test that.
---
 mysql-test/r/kill.result | 6 ++++++
 mysql-test/t/kill.test   | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index f57c134b6d0..2413834be4f 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -5,6 +5,12 @@ select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0
 kill @id;
+select ((@id := kill_id) - kill_id) from t1;
+((@id := kill_id) - kill_id)
+0
+select @id != connection_id();
+@id != connection_id()
+1
 select 4;
 4
 4
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 8a9d96d4946..8492a2a2f8e 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -27,8 +27,9 @@ kill @id;
 --sleep 5
 # verify that con1 is doning a reconnect
 connection con1;
-ping
-ping
+--ping
+--ping
+select ((@id := kill_id) - kill_id) from t1; 
 select @id != connection_id();
 
 #make sure the server is still alive