From: Go MAEDA <maeda@farend.jp>
Date: Fri, 22 Dec 2023 00:07:56 +0000 (+0000)
Subject: Merged r22542 from trunk to 5.1-stable (#39865).
X-Git-Tag: 5.1.2~31
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c465537881d0e4b1e352f24ffb560240eef4b9da;p=redmine.git

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 19fa1ca4f..c3e889bf9 100644
--- 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?