summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-03-18 16:17:10 -0800
committerunknown <jimw@mysql.com>2005-03-18 16:17:10 -0800
commit9739b7a6af3d48c6227d7766ccd98a697b1a6ac0 (patch)
treefaf7054c76952b29bdc8193dbed2b1352ca27381
parentebd6fd9315b4a815991ce9737284ac0dd6812791 (diff)
downloadmariadb-git-9739b7a6af3d48c6227d7766ccd98a697b1a6ac0.tar.gz
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.
-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