From 671d71533b7f5c884a8d139a3a6c7808e0071204 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 30 May 2023 11:49:41 +0200 Subject: [PATCH 1/5] Fix mixed up version numbers in check_mysql_version --- install/lib/installer_base.lib.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 1d15474cf4..34f0d5df81 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -247,7 +247,7 @@ class installer_base { //** Check prerequisites public function check_prerequisites() { global $conf; - + $msg = ''; if ($conf['default_php'] != '') { @@ -266,30 +266,28 @@ class installer_base { public function check_mysql_version() { global $conf; - $min_mariadb_version = '10.0.5'; - // Set MySQL version to 8.0.4 after CentOS 7 support ended to allow preg_* functions in SQL queries - $min_mysql_version = '5.5'; + // Set MariaDB version to 10.0.5 after CentOS 7 support ended to allow preg_* functions in SQL queries + $min_mariadb_version = '5.5'; + $min_mysql_version = '8.0.4'; $rec = $this->db->queryOneRecord('SELECT VERSION() as mysql_version'); if(is_array($rec)) { $version = $rec['mysql_version']; } else { - die("Unable to get MySQL version\n"); + die("Unable to get MySQL or compatible version\n"); } if(strpos($version,'MariaDB')) { // We have MariaDB $parts = explode('-',$version); $version = $parts[0]; - swriteln("MariaDB version ".$version); - if(version_compare($version, $min_mariadb_version, '<')) die("Minimum required MariaDB version is ".$min_mariadb_version."\n"); + swriteln("Checking MariaDB version " . $version . " .. OK"); + if(version_compare($version, $min_mariadb_version, '<')) die("Minimum required MariaDB version is " . $min_mariadb_version . "\n"); } else { - // we have MySQL - swriteln("MySQL version ".$version); - if(version_compare($version, $min_mysql_version, '<')) die("Minimum required MySQL version is ".$min_mysql_version."\n"); + // We have MySQL or Percona + swriteln("Checking MySQL or compatible version " . $version . " .. OK"); + if(version_compare($version, $min_mysql_version, '<')) die("Minimum required MySQL or compatible version is " . $min_mysql_version . "\n"); } - - } public function force_configure_app($service, $enable_force=true) { -- GitLab From 5793f85671ab8ba4c0543da01f8c80d566809b49 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 30 May 2023 13:04:09 +0200 Subject: [PATCH 2/5] Only print OK if the required MySQL/MariaDB versions are met --- install/lib/installer_base.lib.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 34f0d5df81..d3e49db025 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -281,12 +281,18 @@ class installer_base { // We have MariaDB $parts = explode('-',$version); $version = $parts[0]; - swriteln("Checking MariaDB version " . $version . " .. OK"); - if(version_compare($version, $min_mariadb_version, '<')) die("Minimum required MariaDB version is " . $min_mariadb_version . "\n"); + if(version_compare($version, $min_mariadb_version, '<')) { + die("Minimum required MariaDB version is " . $min_mariadb_version . " ,found " . $version ." \n"); + } else { + swriteln("Checking MariaDB version " . $version . " .. OK"); + } } else { // We have MySQL or Percona - swriteln("Checking MySQL or compatible version " . $version . " .. OK"); - if(version_compare($version, $min_mysql_version, '<')) die("Minimum required MySQL or compatible version is " . $min_mysql_version . "\n"); + if(version_compare($version, $min_mysql_version, '<')) { + die("Minimum required MySQL or compatible version is " . $min_mysql_version . " ,found " . $version ." \n"); + } else { + swriteln("Checking MySQL or compatible version " . $version . " .. OK"); + } } } -- GitLab From df6b0bd3b09a436d4daf67d4456c5841b51a1e16 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 30 May 2023 13:10:59 +0200 Subject: [PATCH 3/5] clean up --- install/lib/installer_base.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index d3e49db025..70e34cdd31 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -282,14 +282,14 @@ class installer_base { $parts = explode('-',$version); $version = $parts[0]; if(version_compare($version, $min_mariadb_version, '<')) { - die("Minimum required MariaDB version is " . $min_mariadb_version . " ,found " . $version ." \n"); + die("Minimum required MariaDB version is " . $min_mariadb_version . ",found " . $version ." \n"); } else { swriteln("Checking MariaDB version " . $version . " .. OK"); } } else { // We have MySQL or Percona if(version_compare($version, $min_mysql_version, '<')) { - die("Minimum required MySQL or compatible version is " . $min_mysql_version . " ,found " . $version ." \n"); + die("Minimum required MySQL or compatible version is " . $min_mysql_version . ",found " . $version ." \n"); } else { swriteln("Checking MySQL or compatible version " . $version . " .. OK"); } -- GitLab From a9088f8c33f28ba2b7df2b5cd7d023a51a17ca09 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 30 May 2023 15:40:14 +0200 Subject: [PATCH 4/5] fix whitespace --- install/lib/installer_base.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 70e34cdd31..73208e4bc3 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -282,14 +282,14 @@ class installer_base { $parts = explode('-',$version); $version = $parts[0]; if(version_compare($version, $min_mariadb_version, '<')) { - die("Minimum required MariaDB version is " . $min_mariadb_version . ",found " . $version ." \n"); + die("Minimum required MariaDB version is " . $min_mariadb_version . ",found " . $version . "\n"); } else { swriteln("Checking MariaDB version " . $version . " .. OK"); } } else { // We have MySQL or Percona if(version_compare($version, $min_mysql_version, '<')) { - die("Minimum required MySQL or compatible version is " . $min_mysql_version . ",found " . $version ." \n"); + die("Minimum required MySQL or compatible version is " . $min_mysql_version . ",found " . $version . "\n"); } else { swriteln("Checking MySQL or compatible version " . $version . " .. OK"); } -- GitLab From 35f449d16bb32a7b54b5e1dc619d8b4ec8d91c49 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 1 Jun 2023 12:43:25 +0000 Subject: [PATCH 5/5] Update installer_base.lib.php --- install/lib/installer_base.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 73208e4bc3..43d312b0e6 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -266,9 +266,9 @@ class installer_base { public function check_mysql_version() { global $conf; - // Set MariaDB version to 10.0.5 after CentOS 7 support ended to allow preg_* functions in SQL queries + // Set MariaDB version to 10.0.5 and MySQL version to 8.0.4 after CentOS 7 support ended to allow preg_* functions in SQL queries $min_mariadb_version = '5.5'; - $min_mysql_version = '8.0.4'; + $min_mysql_version = '5.5'; $rec = $this->db->queryOneRecord('SELECT VERSION() as mysql_version'); if(is_array($rec)) { -- GitLab