--- doc/install/fedora/install.pl	2005/03/24 21:42:46	1.7
+++ doc/install/fedora/install.pl	2005/06/29 04:16:54	1.8
@@ -2,7 +2,7 @@
 # The LearningOnline Network 
 # Fedora installation script
 #
-# $Id: install.pl,v 1.7 2005/03/24 21:42:46 matthew Exp $
+# $Id: install.pl,v 1.8 2005/06/29 04:16:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,7 @@ my $test;
 # note: The filehandle LOG is global.
 open LOG,">>loncapa_install.log" || die "Unable to open log file.\n";
 
-print LOG '$Id: install.pl,v 1.7 2005/03/24 21:42:46 matthew Exp $'."\n";
+print LOG '$Id: install.pl,v 1.8 2005/06/29 04:16:54 raeburn Exp $'."\n";
 
 # Some friendly subroutines
 sub die_if_nonempty {
@@ -312,6 +312,14 @@ sub setup_mysql {
     }
     print_and_log("\n");
     #
+
+    my ($mysqlinfo,$mysql_ver);
+    open(PIPE,"/usr/bin/mysql -V  |");
+    $mysqlinfo = <PIPE>;
+    close(PIPE);
+    if ($mysqlinfo =~ /Distrib\s+([\d]+)\./) {
+        $mysql_ver = $1;
+    }
     my $mysql_commands = "CREATE DATABASE loncapa;\n";
     if ($setup_mysql_permissions) {
 	##
@@ -324,10 +332,20 @@ to remember it.
 END
         my $rootpass = <>;
 	chomp $rootpass;
-	$mysql_commands .= <<"END";
+	$mysql_commands .= <<"BLOCKONE";
 INSERT INTO user (Host, User, Password)
 VALUES ('localhost','www',password('localhostkey'));
+BLOCKONE
+        if ($mysql_ver < 4) {
+            $mysql_commands .=<<"BLOCKTWO";
 INSERT INTO db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES ('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
+BLOCKTWO
+        } else {
+            $mysql_commands .=<<"BLOCKTHREE";
+INSERT INTO db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv,Create_tmp_table_priv,Lock_tables_priv) VALUES ('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+BLOCKTHREE
+        }
+        $mysql_commands .=<<"END"; 
 SET PASSWORD FOR root\@localhost=PASSWORD('$rootpass');
 DELETE FROM user WHERE host<>'localhost';
 FLUSH PRIVILEGES;