Merge pull request #1751 from guilleiguaran/mysql-0-3-6

Bump to mysql2 0.3.6

Merge pull request #1751 from guilleiguaran/mysql-0-3-6
Bump to mysql2 0.3.6
9a64c8ec · Santiago Pastorino · 0dd32e8e · 301cad44 · 9a64c8ec · 9a64c8ec
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Gemfile Gemfile +1 -1

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb ...d/lib/active_record/connection_adapters/mysql2_adapter.rb +1 -1

未找到文件。
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ platforms :ruby do
  group :db do
    gem "pg", ">= 0.11.0"
    gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.5"
+    gem "mysql2", ">= 0.3.6"
  end
 end


--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
 # encoding: utf-8

-gem 'mysql2', '~> 0.3.5'
+gem 'mysql2', '~> 0.3.6'
 require 'mysql2'

 module ActiveRecord