merged

mysql-test/t/kill.test:
  Auto merged

2 files changed, 19 insertions, 1 deletions

diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index e9d41c104dd..c390745da16 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -15,6 +15,20 @@ select 4;
 4
 4
 drop table t1;
+kill (select count(*) from mysql.user);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select count(*) from mysql.user)' at line 1
+create table t1 (id int primary key);
+create table t2 (id int unsigned not null);
+insert into t2 select id from t1;
+create table t3 (kill_id int);
+insert into t3 values(connection_id());
+ select id from t1 where id in (select distinct id from t2);
+select ((@id := kill_id) - kill_id) from t3;
+((@id := kill_id) - kill_id)
+0
+kill @id;
+Got one of the listed errors
+drop table t1, t2, t3;
 create table t1 (id int primary key);
 create table t2 (id int unsigned not null);
 insert into t2 select id from t1;
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 8302c767985..eaeb174248b 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -46,8 +46,12 @@ select @id != connection_id();
 connection con2;
 select 4;
 drop table t1;
-
 connection default;
+disconnect con2;
+
+--error 1064
+kill (select count(*) from mysql.user);
+
 #
 # BUG#14851: killing long running subquery processed via a temporary table.
 #