--- doc/install/linux/install.pl	2024/04/27 02:56:13	1.86
+++ doc/install/linux/install.pl	2024/06/12 23:35:04	1.88
@@ -78,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.86 2024/04/27 02:56:13 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.88 2024/06/12 23:35:04 raeburn Exp $'."\n";
 }
 
 #
@@ -1553,8 +1553,8 @@ sub check_mysql_setup {
     my ($instdir,$dsn,$distro) = @_;
     my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
-    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
-    if (($mysqlname =~ /^MariaDB/i) && ($mysqlversion >= 10.4)) {
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    if (($mysqlname =~ /^MariaDB/i) && (($mysqlversion == 10 && $mysqlminorversion >= 4) || ($mysqlversion >= 11))) {
         if ($dbh) {
             my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')");
             $sth->execute();
@@ -1575,7 +1575,7 @@ sub check_mysql_setup {
     }
     if ($dbh) {
         $mysqlsetup = 'noroot';
-        if (($mysqlname !~ /^MariaDB/i) && ($mysqlversion >= 5.7)) {
+        if (($mysqlname !~ /^MariaDB/i) && (($mysqlversion == 5 && $mysqlminorversion >= 7) || ($mysqlversion >= 6))) {
             my $sth = $dbh->prepare("SELECT plugin from mysql.user where User='root'");
             $sth->execute();
             while (my $priv = $sth->fetchrow_array) {
@@ -2478,17 +2478,17 @@ ENDPATCH
 < check_fails()
 ---
 > int check_fails()
-589c591           
-< log_failure()   
----               
-> void log_failure() 
-629c631           
+589c591
+< log_failure()
+---
+> void log_failure()
+629c631
 < snooze(int seconds)
----               
+---
 > void snooze(int seconds)
-653c655           
+653c655
 < main(int argc, char **argv)
----               
+---
 > int main(int argc, char **argv)
 ENDPATCH
 
@@ -2653,21 +2653,23 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 
 sub setup_mysql_permissions {
     my ($dbh,$has_pass,$mysql_unix_socket,@mysql_lc_commands) = @_;
-    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
     my ($usescreate,$usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
     if ($mysqlname =~ /^MariaDB/i) {
         $is_mariadb = 1;
-        if ($mysqlversion >= 10.4) {
+        if ((($mysqlversion == 10) && ($mysqlminorversion >= 4)) || ($mysqlversion >= 11)) {
             $usescreate = 1;
-        } elsif ($mysqlversion >= 10.2) {
+        } elsif (($mysqlversion == 10) && ($mysqlminorversion >= 2)) { 
             $usesauth = 1;
-        } elsif ($mysqlversion >= 5.5) {
+        } elsif (($mysqlversion == 5) && ($mysqlminorversion >= 5)) {
             $hasauthcol = 1;
         }
     } else {
-        if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
+        if (($mysqlversion > 5) || (($mysqlminorversion == 5) && ($mysqlminorversion > 7)) ||
+            (($mysqlversion == 5) && ($mysqlminorversion == 7) && ($mysqlsubver > 5))) {
             $usesauth = 1;
-        } elsif (($mysqlversion >= 5.6) || (($mysqlversion == 5.5) && ($mysqlsubver >= 7))) {
+        } elsif (($mysqlversion == 5) &&
+                 (($mysqlminorversion >= 6) || (($mysqlminorversion == 5) && ($mysqlsubver >= 7)))) {
             $hasauthcol = 1;
         }
     }
@@ -2781,17 +2783,17 @@ sub new_mysql_rootpasswd {
 }
 
 sub get_mysql_version {
-    my ($version,$subversion,$name);
+    my ($version,$minorversion,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)(?:\-?(\w*),|)/);
+        ($version,$minorversion,$subversion,$name) = ($info =~ /(\d+)\.(\d+)\.(\d+)(?:\-?(\w*),|)/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
     }
-    return ($version,$subversion,$name);
+    return ($version,$minorversion,$subversion,$name);
 }
 
 ###########################################################