Merge

1 files changed, 8 insertions, 6 deletions

diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 8492a2a2f8e..6744a212828 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -23,13 +23,15 @@ connection con2;
 select ((@id := kill_id) - kill_id) from t1; 
 kill @id;
 
-# Wait for thread to do.
---sleep 5
-# verify that con1 is doning a reconnect
 connection con1;
---ping
---ping
-select ((@id := kill_id) - kill_id) from t1; 
+
+--disable_reconnect
+# this statement should fail
+--error 2006
+select 1;
+--enable_reconnect
+# this should work, and we should have a new connection_id()
+select ((@id := kill_id) - kill_id) from t1;
 select @id != connection_id();
 
 #make sure the server is still alive