aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJeremy Daer (Kemper) <jeremydaer@gmail.com>2015-09-07 17:51:55 -0700
committerJeremy Daer (Kemper) <jeremydaer@gmail.com>2015-09-07 17:51:55 -0700
commit81dd3872587159ad3514fe70593b208cb5f892ec (patch)
treed0e83b319a1474645438d503629c68668818b6d1 /activerecord
parentcad75ecf6735e8a6cf53e7731f10c4da5ab934bc (diff)
parent5da5e3772c32593ecf2f27b8865e81dcbe3af692 (diff)
downloadrails-81dd3872587159ad3514fe70593b208cb5f892ec.tar.gz
rails-81dd3872587159ad3514fe70593b208cb5f892ec.tar.bz2
rails-81dd3872587159ad3514fe70593b208cb5f892ec.zip
Merge pull request #21536 from jeremy/support-mysql2-0.4.0
Support mysql2 0.4.0, first release with prepared statements support
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index ff43c7ec42..734b384e80 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 @@
require 'active_record/connection_adapters/abstract_mysql_adapter'
-gem 'mysql2', '~> 0.3.18'
+gem 'mysql2', '>= 0.3.18', '< 0.5'
require 'mysql2'
module ActiveRecord