aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-11-29 19:59:19 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-11-29 19:59:19 +0900
commit81279484b928f6fb7a83d7c4ee3e718fa62f29e2 (patch)
treeef668551af2102d90540031363cd2e35c89a37ef /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
parent127a87cf6569f02d3e1b377b23e075e4dcecaac8 (diff)
downloadrails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.tar.gz
rails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.tar.bz2
rails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.zip
`connection_options` is only needed for `MysqlAdapter`
Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index f2d7b54105..76f1b91e6b 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -82,6 +82,7 @@ module ActiveRecord
super
@statements = StatementPool.new(self.class.type_cast_config_to_integer(config.fetch(:statement_limit) { 1000 }))
@client_encoding = nil
+ @connection_options = connection_options
connect
end