From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 2 Jul 2009 01:00:22 +0000 (+0000)
Subject: (bug 11242) Check for MySQL storage engines during installation doesn't check whether... 
X-Git-Tag: 1.31.0-rc.0~41137
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=0f912d826ca579a08b6e4df77ecec956b4a9e0f5;p=lhc%2Fweb%2Fwiklou.git

(bug 11242) Check for MySQL storage engines during installation doesn't check whether engine is actually available. Patch by Jan Reininghaus.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 979a488c0e..4c0cc95ece 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -218,6 +218,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   via extensions not using the userCan hook and via $wgRevokePermissions now work.
 * (bug 8445) Multiple-character search terms are now handled properly for Chinese
 * (bug 19450) Use formatNum for "Number of edits" in Special:Preferences
+* (bug 11242) Check for MySQL storage engines during installation now checks
+  whether the engines are actually available
 
 == API changes in 1.16 ==
 
diff --git a/config/index.php b/config/index.php
index c529a9133a..c2a478b495 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1170,7 +1170,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				$res = $wgDatabase->query( 'SHOW ENGINES' );
 				$found = false;
 				while ( $row = $wgDatabase->fetchObject( $res ) ) {
-					if ( $row->Engine == $conf->DBengine ) {
+					if ( $row->Engine == $conf->DBengine && ( $row->Support == 'YES' || $row->Support == 'DEFAULT' ) ) {
 						$found = true;
 						break;
 					}