changed signal by fd close to signal by vio_close

added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill

4 files changed, 34 insertions, 0 deletions

diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
new file mode 100644
index 00000000000..628c6d21094
--- /dev/null
+++ b/mysql-test/r/kill.result
@@ -0,0 +1,4 @@
+((@id := kill_id) - kill_id)
+0
+4
+4
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
new file mode 100644
index 00000000000..f1bfdf9116d
--- /dev/null
+++ b/mysql-test/r/user_var.result
@@ -0,0 +1,2 @@
+@a - connection_id()
+3
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
new file mode 100644
index 00000000000..19739c88673
--- /dev/null
+++ b/mysql-test/t/kill.test
@@ -0,0 +1,23 @@
+connect (con1, localhost, root,,test,0, mysql-master.sock);
+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());
+
+#kill con1
+connection con2;
+select ((@id := kill_id) - kill_id) from connection_kill; 
+kill @id;
+
+# verify that con1 is really dead
+connection con1;
+error 2013;
+select 1;
+
+#make sure the server is still alive
+connection con2;
+select 4;
+drop table connection_kill;
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
new file mode 100644
index 00000000000..711b23b7ac1
--- /dev/null
+++ b/mysql-test/t/user_var.test
@@ -0,0 +1,5 @@
+error 1204;
+set @a := foo;
+set @a := connection_id() + 3;
+select @a - connection_id();
+