Third pass at separating out connect options from query options

Author: sodabrew

lib/mysql2/client.rb

@@ -25,9 +25,9 @@ class Client
     def initialize(opts = {})
       opts = Mysql2::Util.key_hash_as_symbols(opts)
       @query_options = @@default_query_options.dup
-      @query_options.merge! opts
+      @query_options.merge! opts.select { |k, v| @@default_connect_options.has_key?(k) ? false : true }
       @connect_options = @@default_connect_options.dup
-      @connect_options.merge! opts
+      @connect_options.merge! opts.select { |k, v| @@default_connect_options.has_key?(k) ? true : false }
 
       initialize_ext
 
@@ -71,6 +71,7 @@ def initialize(opts = {})
       port = port.to_i unless port.nil?
       database = database.to_s unless database.nil?
       socket = socket.to_s unless socket.nil?
+      flags = flags.to_i # if nil then 0
 
       connect user, pass, host, port, database, socket, flags
     end