[Koha-cvs] koha/misc Install.pm [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	06/08/03 09:39:51

Modified files:
	misc           : Install.pm 

Log message:
	fix for #1039 : privileges on database

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.88.2.9&r2=1.88.2.10

Patches:
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.9
retrieving revision 1.88.2.10
diff -u -b -r1.88.2.9 -r1.88.2.10
--- Install.pm	28 Jul 2006 02:02:01 -0000	1.88.2.9
+++ Install.pm	3 Aug 2006 09:39:51 -0000	1.88.2.10
@@ -1764,7 +1764,7 @@
 To create the koha database, please enter your
 mysql server's root user password:
 
-Password: |;	#'
+Password: |;
 
 $messages->{'CreatingDatabase'}->{en} = heading('CREATING DATABASE') . qq|
 Creating the MySQL database for Koha...
@@ -1828,12 +1828,10 @@
 	setmysqlclipass($mysqlpass);
 	# Set up permissions
 	startsysout();
-	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
-	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
-	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
+	my $result=system("$mysqldir/bin/mysqladmin", "-u$mysqluser", "create", "$database");
+	system("$mysqldir/bin/mysql -u$mysqluser -e \"GRANT ALL PRIVILEGES on ".$database.".* to '$user' IDENTIFIED BY '$pass' \" mysql");
 	# Change to admin user login
 	setmysqlclipass($pass);
-	my $result=system("$mysqldir/bin/mysqladmin", "-u$user", "create", "$database");
 	if ($result) {
 		showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
 	} else {