diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-09 23:20:20 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-09 23:20:20 +0000 |
| commit | 39b71bb8a18baf56a4c9b1ac55fb486a61246672 (patch) | |
| tree | 9606cc2aeafb80b4d66721a315b27f1050b18ff1 /activerecord/lib/active_record/connection_adapters | |
| parent | 08309ba51a12eda2be2a8bd142255c14e78a2d4b (diff) | |
| download | rails-39b71bb8a18baf56a4c9b1ac55fb486a61246672.tar.gz rails-39b71bb8a18baf56a4c9b1ac55fb486a61246672.tar.bz2 rails-39b71bb8a18baf56a4c9b1ac55fb486a61246672.zip | |
MySQL: ensure that @config is set.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3264 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -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 |