Merged r22542 from trunk to 5.1-stable (#39865).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22543 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 19fa1ca4fc0030a59a78f7dd5f3821df12b569ce..c3e889bf90ab1f84f2a094d30e81fd88bcccda85 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -204,7 +204,8 @@ class ActiveSupport::TestCase
   end
 
   def mysql8?
-    Gem::Version.new(Redmine::Database.mysql_version) >= Gem::Version.new('8.0.0')
+    version = Redmine::Database.mysql_version.sub(/^(\d+\.\d+\.\d+).*/, '\1')
+    Gem::Version.new(version) >= Gem::Version.new('8.0.0')
   end
 
   def postgresql?