First pass at separating out connect options from query options

Author: sodabrew

lib/mysql2/client.rb

@@ -1,6 +1,12 @@
 module Mysql2
   class Client
     attr_reader :query_options, :read_timeout
+    @@default_connect_options = {
+      :connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
+      :default_file => nil,
+      :default_group => nil
+    }
+
     @@default_query_options = {
       :as => :hash,                   # the type of object you want each row back as; also supports :array (an array of values)
       :async => false,                # don't wait for a result after sending the query, you'll have to monitor the socket yourself then eventually call Mysql2::Client#async_result
@@ -9,16 +15,14 @@ class Client
       :database_timezone => :local,   # timezone Mysql2 will assume datetime objects are stored in
       :application_timezone => nil,   # timezone Mysql2 will convert to before handing the object back to the caller
       :cache_rows => true,            # tells Mysql2 to use it's internal row cache for results
-      :connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
-      :cast => true,
-      :default_file => nil,
-      :default_group => nil
+      :cast => true
     }
 
     def initialize(opts = {})
       opts = Mysql2::Util.key_hash_as_symbols( opts )
       @read_timeout = nil
       @query_options = @@default_query_options.dup
+      @query_options.merge! @@default_connect_options
       @query_options.merge! opts
 
       initialize_ext