aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-06-17 11:27:37 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-06-17 11:27:37 -0500
commit301cad4476c89d4df2db38cbbe9dc87aa28b174f (patch)
tree9de703192a006b43ab28ceebf57018c2bbde5352
parent0dd32e8edbc2ba5d4496e7f8063536c507b74c5f (diff)
downloadrails-301cad4476c89d4df2db38cbbe9dc87aa28b174f.tar.gz
rails-301cad4476c89d4df2db38cbbe9dc87aa28b174f.tar.bz2
rails-301cad4476c89d4df2db38cbbe9dc87aa28b174f.zip
Bump to mysql2 0.3.6
-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 c5b1a46d01..fc4fdb17f5 100644
--- 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
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 798c0db2cf..d6c167ad36 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 @@
# encoding: utf-8
-gem 'mysql2', '~> 0.3.5'
+gem 'mysql2', '~> 0.3.6'
require 'mysql2'
module ActiveRecord