aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-11-28 03:15:30 -0800
committerJosé Valim <jose.valim@gmail.com>2011-11-28 03:15:30 -0800
commit5f75a92c32973d4726e275173855b2af99ff2edb (patch)
treef8d83f7717258b4e2e2e1db337086d61d2438072 /activerecord/lib/active_record
parent9ca58ba492fdd1729aa03ca8ec89be941a0f6d4e (diff)
parent13847ccb43c3d0bdd6341887deda212316861e2d (diff)
downloadrails-5f75a92c32973d4726e275173855b2af99ff2edb.tar.gz
rails-5f75a92c32973d4726e275173855b2af99ff2edb.tar.bz2
rails-5f75a92c32973d4726e275173855b2af99ff2edb.zip
Merge pull request #3657 from arunagw/mysql2_bump_master
Bump Mysql2!
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
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 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