[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Tue Feb 19 19:14:54 2019 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support both Mariadb 10.2 and newer, and MySQL 5.7.6 and newer. (logic
    was backwards in rev. 1.50).
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.50 doc/install/linux/install.pl:1.51
--- doc/install/linux/install.pl:1.50	Tue Feb 19 19:03:42 2019
+++ doc/install/linux/install.pl	Tue Feb 19 19:14:54 2019
@@ -77,7 +77,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.50 2019/02/19 19:03:42 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.51 2019/02/19 19:14:54 raeburn Exp $'."\n";
 }
 
 #
@@ -2477,10 +2477,10 @@
     my ($currmysqlpass,$usesauth,$is_mariadb) = @_;
     if ($usesauth) {
         if ($is_mariadb) {
-            return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'",
+            return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
                     "FLUSH PRIVILEGES;");
         } else {
-            return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
+            return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'",
                     "FLUSH PRIVILEGES;");
         }
     } else {