Merge branch '0.2.x'

brianmario · brianmario · commit 0f2f3c044a36 · 2011-10-19T14:30:26.000-07:00
diff --git a/lib/mysql2/client.rb b/lib/mysql2/client.rb
@@ -15,6 +15,7 @@ class Client
 
     def initialize(opts = {})
       @query_options = @@default_query_options.dup
+      @query_options.merge! opts
 
       init_connection
 
