summaryrefslogtreecommitdiff
path: root/mysql-test/t/kill.test
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-15 03:55:48 +0200
committerunknown <monty@donna.mysql.fi>2001-03-15 03:55:48 +0200
commit41ed01413fdfcfa8bec77c8ebd1a6850feb04463 (patch)
tree07b5e02de968248c9c9cf63912c2416cb016c45f /mysql-test/t/kill.test
parent68414519cb85f346fc04a169f390a33c46f0b0d0 (diff)
downloadmariadb-git-41ed01413fdfcfa8bec77c8ebd1a6850feb04463.tar.gz
Added fix for using variables with distinct
Docs/manual.texi: Updated links client/mysqltest.c: Added 'ping' method configure.in: Upgraded version number mysql-test/r/user_var.result: Added test for using variables with distinct mysql-test/t/kill.test: Use 'ping' to force reconnect mysql-test/t/user_var.test: Added test for using variables with distinct sql-bench/run-all-tests.sh: Fixed argument passing
Diffstat (limited to 'mysql-test/t/kill.test')
-rw-r--r--mysql-test/t/kill.test19
1 files changed, 11 insertions, 8 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 19739c88673..0191461f73f 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -3,21 +3,24 @@ connect (con2, localhost, root,,test,0, mysql-master.sock);
#remember id of con1
connection con1;
-drop table if exists connection_kill;
-create table connection_kill (kill_id int);
-insert into connection_kill values(connection_id());
+drop table if exists t1;
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
#kill con1
connection con2;
-select ((@id := kill_id) - kill_id) from connection_kill;
+select ((@id := kill_id) - kill_id) from t1;
kill @id;
-# verify that con1 is really dead
+# Wait for thread to do.
+--sleep 5
+# verify that con1 is doning a reconnect
connection con1;
-error 2013;
-select 1;
+ping
+ping
+select @id != connection_id();
#make sure the server is still alive
connection con2;
select 4;
-drop table connection_kill;
+drop table t1;