aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-17 22:48:22 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-17 22:50:58 -0200
commitaf43e719ac45ea3f8589b07d4d1d43d8bf0a31e9 (patch)
treedccdfeeeb2013e827a78f953f51e565fdda2d89f
parent89a00f3746e7d56ad2e40bfdbcee40d7fb8682bd (diff)
downloadrails-af43e719ac45ea3f8589b07d4d1d43d8bf0a31e9.tar.gz
rails-af43e719ac45ea3f8589b07d4d1d43d8bf0a31e9.tar.bz2
rails-af43e719ac45ea3f8589b07d4d1d43d8bf0a31e9.zip
Bump mysql gem version to the newly 2.9.0, fix build.
-rw-r--r--Gemfile2
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 3edc07e176..35bcb68fb2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ platforms :ruby do
group :db do
gem 'pg', '>= 0.11.0'
- gem 'mysql', '>= 2.8.1'
+ gem 'mysql', '>= 2.9.0'
gem 'mysql2', '>= 0.3.10'
end
end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 76667616a1..9627aaae3a 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -2,7 +2,7 @@ require 'active_record/connection_adapters/abstract_mysql_adapter'
require 'active_record/connection_adapters/statement_pool'
require 'active_support/core_ext/hash/keys'
-gem 'mysql', '~> 2.8.1'
+gem 'mysql', '~> 2.9.0'
require 'mysql'
class Mysql