Merge pull request #180 from loe/0.2.x

0.2.x test for issue #99

spec/mysql2/client_spec.rb

@@ -177,6 +177,33 @@ def connect *args
         }.should raise_error(Mysql2::Error)
       end
 
+      it "should close the connection when an exception is raised" do
+        begin
+          Timeout.timeout(1) do
+            @client.query("SELECT sleep(2)")
+          end
+        rescue Timeout::Error
+        end
+
+        lambda {
+          @client.query("SELECT 1")
+        }.should raise_error(Mysql2::Error, 'closed MySQL connection')
+      end
+
+      it "should handle Timeouts without leaving the connection hanging if reconnect is true" do
+        client = Mysql2::Client.new(:reconnect => true)
+        begin
+          Timeout.timeout(1) do
+            client.query("SELECT sleep(2)")
+          end
+        rescue Timeout::Error
+        end
+
+        lambda {
+          client.query("SELECT 1")
+        }.should_not raise_error(Mysql2::Error)
+      end
+
       it "threaded queries should be supported" do
         threads, results = [], {}
         connect = lambda{ Mysql2::Client.new(:host => "localhost", :username => "root") }