From 39b71bb8a18baf56a4c9b1ac55fb486a61246672 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 9 Dec 2005 23:20:20 +0000 Subject: MySQL: ensure that @config is set. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3264 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 0a51559fed..14991c2171 100755 --- 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 -- cgit v1.2.3