From 0f912d826ca579a08b6e4df77ecec956b4a9e0f5 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 2 Jul 2009 01:00:22 +0000
Subject: [PATCH] (bug 11242) Check for MySQL storage engines during
 installation doesn't check whether engine is actually available. Patch by Jan
 Reininghaus.

---
 RELEASE-NOTES    | 2 ++
 config/index.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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;
 					}
-- 
2.20.1