summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-03-18 16:17:10 -0800
committerjimw@mysql.com <>2005-03-18 16:17:10 -0800
commit146994ed4c41f761ea34ff72fd2b21ca44a27ef6 (patch)
treefaf7054c76952b29bdc8193dbed2b1352ca27381
parent7de90716b0ebd78bf53dbb5d1327efe329139006 (diff)
downloadmariadb-git-146994ed4c41f761ea34ff72fd2b21ca44a27ef6.tar.gz
Fix 'kill' test to actually test that the connection has
been killed.
-rw-r--r--mysql-test/r/kill.result6
-rw-r--r--mysql-test/t/kill.test5
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