Using latest mysql2 release.

rjocoleman · Sep 9, 2012 · 2ba46ba · 2ba46ba
1 parent 7ccb0ff
commit 2ba46ba
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,9 +6,6 @@ gem 'riddle', '1.5.3'
 gem 'combustion',
   :git => 'git://github.com/pat/combustion.git',
   :ref => '45f50e64c3'
-gem 'mysql2',
-  :git => 'git://github.com/brianmario/mysql2.git',
-  :ref => '84ca9ffbc5'
 
 gem 'pg', '~> 0.11.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1.3', :platform => :jruby
diff --git a/gemfiles/rails_3_1.gemfile b/gemfiles/rails_3_1.gemfile
@@ -4,7 +4,6 @@ source :rubygems
 
 gem "riddle", "1.5.3"
 gem "combustion", :git=>"git://github.com/pat/combustion.git", :ref=>"45f50e64c3"
-gem "mysql2", :git=>"git://github.com/brianmario/mysql2.git", :ref=>"84ca9ffbc5"
 gem "pg", "~> 0.11.0", :platform=>:ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.1.3", :platform=>:jruby
 gem "rails", "~> 3.1.0"

diff --git a/gemfiles/rails_3_2.gemfile b/gemfiles/rails_3_2.gemfile
@@ -4,7 +4,6 @@ source :rubygems
 
 gem "riddle", "1.5.3"
 gem "combustion", :git=>"git://github.com/pat/combustion.git", :ref=>"45f50e64c3"
-gem "mysql2", :git=>"git://github.com/brianmario/mysql2.git", :ref=>"84ca9ffbc5"
 gem "pg", "~> 0.11.0", :platform=>:ruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.1.3", :platform=>:jruby
 gem "rails", "~> 3.2.0"

diff --git a/thinking-sphinx.gemspec b/thinking-sphinx.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '>= 3.1.0'
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
-  # s.add_runtime_dependency 'mysql2',       '>= 0.2.18'
+  s.add_runtime_dependency 'mysql2',       '>= 0.3.12b4'
   s.add_runtime_dependency 'riddle',       '>= 1.5.2'
 
   s.add_development_dependency 'appraisal',        '~> 0.4.0'