Skip to content

Commit 5793f85

Browse files
committed
Only print OK if the required MySQL/MariaDB versions are met
1 parent 671d715 commit 5793f85

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

install/lib/installer_base.lib.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,18 @@ public function check_mysql_version() {
281281
// We have MariaDB
282282
$parts = explode('-',$version);
283283
$version = $parts[0];
284-
swriteln("Checking MariaDB version " . $version . " .. OK");
285-
if(version_compare($version, $min_mariadb_version, '<')) die("Minimum required MariaDB version is " . $min_mariadb_version . "\n");
284+
if(version_compare($version, $min_mariadb_version, '<')) {
285+
die("Minimum required MariaDB version is " . $min_mariadb_version . " ,found " . $version ." \n");
286+
} else {
287+
swriteln("Checking MariaDB version " . $version . " .. OK");
288+
}
286289
} else {
287290
// We have MySQL or Percona
288-
swriteln("Checking MySQL or compatible version " . $version . " .. OK");
289-
if(version_compare($version, $min_mysql_version, '<')) die("Minimum required MySQL or compatible version is " . $min_mysql_version . "\n");
291+
if(version_compare($version, $min_mysql_version, '<')) {
292+
die("Minimum required MySQL or compatible version is " . $min_mysql_version . " ,found " . $version ." \n");
293+
} else {
294+
swriteln("Checking MySQL or compatible version " . $version . " .. OK");
295+
}
290296
}
291297
}
292298

0 commit comments

Comments
 (0)