Increase minimum MySQL 8 version to 8.0.19

Limited by: Nothing really. Ubuntu Focal ships with 8.0.21 which was released
in July 2020. While there should be no good reason to not apply these bugfix
upgrades we'll give a bit of leeway and select 8.0.19 which is from January
2020 and thus one year younger than the previous 8.0.14 which is from January
2019.

diff --git a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
index 6fdcd7683eb43473b9331c2de5afde1e337efc93..45601145bd578f569149f9b3ad8814a06f44e157 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
@@ -52,10 +52,8 @@ class SystemCheckPage extends AbstractPage {
        
        public $mysqlVersions = [
                'mysql' => [
-                       // MySQL 8.0 < 8.0.14 contains a nasty bug
-                       // https://bugs.mysql.com/bug.php?id=88718
                        '5' => '5.7.31',
-                       '8' => '8.0.14',
+                       '8' => '8.0.19',
                ],
                'mariadb' => [
                        '10' => '10.1.44',
@@ -214,8 +212,6 @@ class SystemCheckPage extends AbstractPage {
                        $this->results['mysql']['result'] = (version_compare($compareSQLVersion, $this->mysqlVersions['mariadb']['10']) >= 0);
                }
                else {
-                       // For MySQL 8.0, MySQL 8.0.14+ is required
-                       // https://bugs.mysql.com/bug.php?id=88718
                        if ($compareSQLVersion[0] === '5') {
                                $this->results['mysql']['result'] = (version_compare($compareSQLVersion, $this->mysqlVersions['mysql']['5']) >= 0);
                        }

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 368179c550e381e0c245ce0c91c5e7268568474f..85fb935667453db39c971bfdcf34cd1da312d180 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -724,17 +724,15 @@ class WCFSetup extends WCF {
                                        }
                                }
                                else {
-                                       // MySQL 5.7.31+ or MySQL 8.0.14+ are required
-                                       // https://bugs.mysql.com/bug.php?id=88718
                                        if ($compareSQLVersion[0] === '8') {
-                                               // MySQL 8.0.14+
-                                               if (!(version_compare($compareSQLVersion, '8.0.14') >= 0)) {
-                                                       throw new SystemException("Insufficient MySQL version '".$compareSQLVersion."'. Version '5.7.31' or greater, or version '8.0.14' or greater is needed.");
+                                               // MySQL 8.0.19+
+                                               if (!(version_compare($compareSQLVersion, '8.0.19') >= 0)) {
+                                                       throw new SystemException("Insufficient MySQL version '".$compareSQLVersion."'. Version '5.7.31' or greater, or version '8.0.19' or greater is needed.");
                                                }
                                        }
                                        else if (!(version_compare($compareSQLVersion, '5.7.31') >= 0)) {
                                                // MySQL 5.7.31+
-                                               throw new SystemException("Insufficient MySQL version '".$compareSQLVersion."'. Version '5.7.31' or greater, or version '8.0.14' or greater is needed.");
+                                               throw new SystemException("Insufficient MySQL version '".$compareSQLVersion."'. Version '5.7.31' or greater, or version '8.0.19' or greater is needed.");
                                        }
                                }
                                

diff --git a/wcfsetup/test.php b/wcfsetup/test.php
index 8eb6a29baff44b2d3af6cc30990598c619dc3136..bf9e4f52940c0b986bb00ced25abc1e734a1f9a9 100644 (file)
--- a/wcfsetup/test.php
+++ b/wcfsetup/test.php
@@ -264,8 +264,8 @@ $phrases = [
                'en' => 'MySQL Requirements'
        ],
        'mysql_version' => [
-               'de' => 'Bitte stellen Sie sicher, dass MySQL 5.7.31+/MySQL 8.0.14+  oder MariaDB 10.1.44+ mit InnoDB-Unterstützung vorhanden ist.',
-               'en' => 'Please make sure that MySQL 5.7.31+/MySQL 8.0.14+ or MariaDB 10.1.44+, with InnoDB support is available.'
+               'de' => 'Bitte stellen Sie sicher, dass MySQL 5.7.31+/MySQL 8.0.19+  oder MariaDB 10.1.44+ mit InnoDB-Unterstützung vorhanden ist.',
+               'en' => 'Please make sure that MySQL 5.7.31+/MySQL 8.0.19+ or MariaDB 10.1.44+, with InnoDB support is available.'
        ],
        'result' => [
                'de' => 'Ergebnis',