diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-27 14:44:28 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-27 14:44:28 -0700 |
commit | bed6a775df086c58e7129805dec4cbe755856df2 (patch) | |
tree | c9dae361dc89277fb71be136408dc3ad16d8cd44 | |
parent | e190569cfb9a8cef2acaba947c579f883b254935 (diff) | |
download | rails-bed6a775df086c58e7129805dec4cbe755856df2.tar.gz rails-bed6a775df086c58e7129805dec4cbe755856df2.tar.bz2 rails-bed6a775df086c58e7129805dec4cbe755856df2.zip |
requiring a newer version of the mysql2 gem
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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 |