SOURCES: mediawiki-mysqlroot.patch - updated to 1.5.3

[glen]

Author: glen                         Date: Sat Dec 10 23:10:10 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.5.3

---- Files affected:
SOURCES:
   mediawiki-mysqlroot.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/mediawiki-mysqlroot.patch
diff -u SOURCES/mediawiki-mysqlroot.patch:1.2 SOURCES/mediawiki-mysqlroot.patch:1.3
--- SOURCES/mediawiki-mysqlroot.patch:1.2	Fri May  6 23:42:29 2005
+++ SOURCES/mediawiki-mysqlroot.patch	Sun Dec 11 00:10:05 2005
@@ -9,12 +9,23 @@
  		$wgDBadminpassword = $conf->RootPW;
  		$wgDBprefix = $conf->DBprefix;
  		$wgCommandLineMode = true;
-@@ -438,7 +438,7 @@
- 		require_once( "maintenance/InitialiseMessages.inc" );
- 
- 		$wgTitle = Title::newFromText( "Installation script" );
+--- ./config/index.php~	2005-12-10 21:58:59.000000000 +0200
++++ ./config/index.php	2005-12-10 22:02:03.000000000 +0200
+@@ -480,14 +480,14 @@
+ 				see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
+ 			 	>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b></li>\n";
+ 		}
+-		print "<li>Trying to connect to MySQL on $wgDBserver as root...\n";
 -		$wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
-+		$wgDatabase = Database::newFromParams( $wgDBserver, $wgDBadminuser, $conf->RootPW, "", 1 );
- 		$wgDatabase->ignoreErrors(true);
++		print "<li>Trying to connect to MySQL on $wgDBserver as MySQL root...\n";
++		$wgDatabase = Database::newFromParams( $wgDBserver, "mysql", $conf->RootPW, "", 1 );
  
- 		@$myver = mysql_get_server_info( $wgDatabase->mConn );
+ 		if( $wgDatabase->isOpen() ) {
+ 			$myver = mysql_get_server_info( $wgDatabase->mConn );
+ 			$wgDatabase->ignoreErrors(true);
+ 			$conf->Root = true;
+-			print "<ul><li>Connected as root (automatic)</li></ul></li>\n";
++			print "<ul><li>Connected as MySQL root (automatic)</li></ul></li>\n";
+ 		} else {
+ 			print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
+ 				": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mediawiki-mysqlroot.patch?r1=1.2&r2=1.3&f=u