diff options
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 5 |
1 files changed, 2 insertions, 3 deletions
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 |