MySQL: ensure that @config is set.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3264 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2026-02-03 02:35:08 -05:00 · 2005-12-09 23:20:20 +00:00
parent 08309ba51a
commit 39b71bb8a1
1 changed files with 2 additions and 3 deletions
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -80,11 +80,10 @@ module ActiveRecord
        "MySQL server has gone away"
      ]

-      def initialize(connection, logger, connection_options=nil, config={})
+      def initialize(connection, logger, connection_options, config)
        super(connection, logger)
-        @connection_options = connection_options
+        @connection_options, @config = connection_options, config
        @null_values_in_each_hash = Mysql.const_defined?(:VERSION)
-        @config = config
        connect
      end