aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-27 14:44:28 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-27 14:44:28 -0700
commitbed6a775df086c58e7129805dec4cbe755856df2 (patch)
treec9dae361dc89277fb71be136408dc3ad16d8cd44
parente190569cfb9a8cef2acaba947c579f883b254935 (diff)
downloadrails-bed6a775df086c58e7129805dec4cbe755856df2.tar.gz
rails-bed6a775df086c58e7129805dec4cbe755856df2.tar.bz2
rails-bed6a775df086c58e7129805dec4cbe755856df2.zip
requiring a newer version of the mysql2 gem
-rw-r--r--Gemfile2
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 98272c7261..8b6ddbd7c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ platforms :ruby do
group :db do
gem "pg", ">= 0.11.0"
gem "mysql", ">= 2.8.1"
- gem "mysql2", :git => "git://github.com/brianmario/mysql2.git"
+ gem "mysql2", ">= 0.3.0"
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 7ac72acd58..cf68ddc2da 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,5 +1,6 @@
# encoding: utf-8
+gem 'mysql2', '~> 0.3.0'
require 'mysql2'
module ActiveRecord