Improve the forced reconnect code in the init_command test.

Instead of using a timeout to trigger a connection close, explicitly kill the connection.
Instead of testing the return value of ping for reconnect, test that the connection ID changed.

Author: sodabrew

spec/mysql2/client_spec.rb

@@ -91,15 +91,26 @@ def connect *args
     result = client.query("SELECT @something;")
     result.first['@something'].should eq('setting_value')
 
-    # simulate a broken connection
+    # get the current connection id
+    result = client.query("SELECT CONNECTION_ID()")
+    first_conn_id = result.first['CONNECTION_ID()']
+
+    # break the current connection
     begin
-      Timeout.timeout(1, Timeout::Error) do
-        client.query("SELECT sleep(2)")
-      end
-    rescue Timeout::Error
+      client.query("KILL #{first_conn_id}")
+    rescue Mysql2::Error
     end
-    client.ping.should be_false
 
+    client.ping # reconnect now
+
+    # get the new connection id
+    result = client.query("SELECT CONNECTION_ID()")
+    second_conn_id = result.first['CONNECTION_ID()']
+
+    # confirm reconnect by checking the new connection id
+    first_conn_id.should_not == second_conn_id
+
+    # At last, check that the init command executed
     result = client.query("SELECT @something;")
     result.first['@something'].should eq('setting_value')
   end