diff --git a/Gemfile b/Gemfile
index b831a265d0..d829a2b448 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ platforms :ruby do
   group :db do
     gem 'pg', '>= 0.18.0'
     gem 'mysql', '>= 2.9.0'
-    gem 'mysql2', '>= 0.3.18'
+    gem 'mysql2', '>= 0.4.0', github: 'brianmario/mysql2'
   end
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 46c347c98a..0700980bca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,6 +19,12 @@ GIT
       qu (= 0.2.0)
       redis-namespace
 
+GIT
+  remote: git://github.com/brianmario/mysql2.git
+  revision: 4d76557499b762d5a62aebb7f6a56510ad221eab
+  specs:
+    mysql2 (0.4.0)
+
 GIT
   remote: git://github.com/mikel/mail.git
   revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce
@@ -203,7 +209,6 @@ GEM
     multi_json (1.11.2)
     mustache (1.0.2)
     mysql (2.9.1)
-    mysql2 (0.3.19)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-x64-mingw32)
@@ -313,7 +318,7 @@ DEPENDENCIES
   minitest (< 5.3.4)
   mocha (~> 0.14)
   mysql (>= 2.9.0)
-  mysql2 (>= 0.3.18)
+  mysql2 (>= 0.4.0)!
   nokogiri (>= 1.4.5)
   pg (>= 0.18.0)
   psych (~> 2.0)
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