aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2011-11-17 12:44:06 +0530
committerArun Agrawal <arunagw@gmail.com>2011-11-22 18:47:27 +0530
commit13847ccb43c3d0bdd6341887deda212316861e2d (patch)
tree3bcdca0298a514d984b147abcc9e46fb5ba2e847
parent8cae31c800f281212c9c5b5ac0ea2be98c4aa611 (diff)
downloadrails-13847ccb43c3d0bdd6341887deda212316861e2d.tar.gz
rails-13847ccb43c3d0bdd6341887deda212316861e2d.tar.bz2
rails-13847ccb43c3d0bdd6341887deda212316861e2d.zip
Bump Mysql2!
-rw-r--r--Gemfile2
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index b0fbb3b310..65950cdc2e 100644
--- 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
index 971f3c35f3..95f254ddd2 100644
--- 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