diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-04 20:29:21 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-04 20:29:21 -0300 |
| commit | 57989c58dfffa8854d2bcb706202cd04a418da70 (patch) | |
| tree | 021a67a702a22a98ba6bca197c0ce12fe668c6c7 /activerecord/lib | |
| parent | 7a3ca69959e312a215d5e8144fca79a08654fd89 (diff) | |
| parent | 977ffe880624bbd05f5ee1cc6e4fa51a999884ab (diff) | |
| download | rails-57989c58dfffa8854d2bcb706202cd04a418da70.tar.gz rails-57989c58dfffa8854d2bcb706202cd04a418da70.tar.bz2 rails-57989c58dfffa8854d2bcb706202cd04a418da70.zip | |
Merge pull request #21112 from kamipo/fix_mysql2_version
Should use `server_info[:version]` instead of `info[:version]`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index e97e82f056..b7db57c9fe 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -254,7 +254,7 @@ module ActiveRecord end def full_version - @full_version ||= @connection.info[:version] + @full_version ||= @connection.server_info[:version] end def set_field_encoding field_name |