Merge pull request #335 from dbussink/master

Use string key for alternative hostname

Author: sodabrew

spec/mysql2/client_spec.rb

@@ -10,7 +10,7 @@
     lambda {
       # The odd local host IP address forces the mysql client library to
       # use a TCP socket rather than a domain socket.
-      Mysql2::Client.new DatabaseCredentials['root'].merge(:host => '127.0.0.2', :port => 999999)
+      Mysql2::Client.new DatabaseCredentials['root'].merge('host' => '127.0.0.2', 'port' => 999999)
     }.should raise_error(Mysql2::Error)
   end
 
@@ -293,13 +293,17 @@ def connect *args
 
       it "threaded queries should be supported" do
         threads, results = [], {}
+        lock = Mutex.new
         connect = lambda{
           Mysql2::Client.new(DatabaseCredentials['root'])
         }
         Timeout.timeout(0.7) do
           5.times {
             threads << Thread.new do
-              results[Thread.current.object_id] = connect.call.query("SELECT sleep(0.5) as result")
+              result = connect.call.query("SELECT sleep(0.5) as result")
+              lock.synchronize do
+                results[Thread.current.object_id] = result
+              end
             end
           }
         end