Merge pull request #3657 from arunagw/mysql2_bump_master

Bump Mysql2!
rails · Nov 28, 2011 · 5f75a92 · 5f75a92
2 parents 9ca58ba + 13847cc
commit 5f75a92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -62,7 +62,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.6"
+    gem "mysql2", ">= 0.3.10"
   end
 end
 

diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,6 +1,6 @@
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
-gem 'mysql2', '~> 0.3.6'
+gem 'mysql2', '~> 0.3.10'
 require 'mysql2'
 
 module ActiveRecord