(bug 11242) Check for MySQL storage engines during installation doesn't check whether...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 979a488..4c0cc95 100644 (file)
--- 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 c529a91..c2a478b 100644 (file)
--- 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;
                                        }