1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 65d4f27059f..c8adff32eb7 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -35,3 +35,22 @@ select @id != connection_id();
 connection con2;
 select 4;
 drop table t1;
+
+#
+# test of blocking of sending ERROR after OK or EOF
+#
+connection con1;
+select get_lock("a", 10);
+connection con2;
+let $ID= `select connection_id()`;
+send select get_lock("a", 10);
+-- sleep 2
+connection con1;
+disable_query_log;
+eval kill query $ID;
+enable_query_log;
+connection con2;
+reap;
+select 1;
+connection con1;
+select RELEASE_LOCK("a");