r87512 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87511‎ | r87512 | r87513 >
Date:21:28, 5 May 2011
Author:demon
Status:ok
Tags:
Comment:
Fix for r87278: if we're installing with the same user we're going to use, skip creation && grants since there's no point.
Modified paths:
  • /trunk/phase3/includes/installer/MysqlInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/MysqlInstaller.php
@@ -419,6 +419,10 @@
420420 }
421421
422422 public function setupUser() {
 423+ $dbUser = $this->getVar( 'wgDBuser' );
 424+ if( $dbUser == $this->getVar( '_InstallUser' ) ) {
 425+ return Status::newGood();
 426+ }
423427 $status = $this->getConnection();
424428 if ( !$status->isOK() ) {
425429 return $status;
@@ -428,7 +432,6 @@
429433 $dbName = $this->getVar( 'wgDBname' );
430434 $this->db->selectDB( $dbName );
431435 $server = $this->getVar( 'wgDBserver' );
432 - $dbUser = $this->getVar( 'wgDBuser' );
433436 $password = $this->getVar( 'wgDBpassword' );
434437 $grantableNames = array();
435438

Follow-up revisions

RevisionCommit summaryAuthorDate
r88201MFT r87512demon20:30, 15 May 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r87278(bug 28375) When using existing DB user, grants aren't added to new tablesdemon18:54, 2 May 2011

Status & tagging log