diff --git a/Gemfile b/Gemfile
index c5b1a46d01eeecdd8b8eebfb141c4f1cab68a08b..fc4fdb17f5fe818585f6029c41f0e9d94c995d23 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.11.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.5"
+    gem "mysql2", ">= 0.3.6"
   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 798c0db2cf236eb63252ed07d8cdac09f0dba43b..d6c167ad3676191255ff3131cb2cc32d69817319 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 @@
 # encoding: utf-8
 
-gem 'mysql2', '~> 0.3.5'
+gem 'mysql2', '~> 0.3.6'
 require 'mysql2'
 
 module ActiveRecord