From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 27 May 2017 07:32:59 +0000 (+0000)
Subject: Merged r16553 (#25829).
X-Git-Tag: 3.3.4~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d06d0b1c39a11327facf8d374e25bab2add70741;p=redmine.git

Merged r16553 (#25829).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 00d44b520..138884823 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ if File.exist?(database_file)
     adapters.each do |adapter|
       case adapter
       when 'mysql2'
-        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
+        gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
       when 'mysql'
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby