From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 4 Jan 2012 15:52:48 +0000 (+0000)
Subject: Fix Bug 29102 - Upgrade fails "Unknown character set: 'mysql4'
X-Git-Tag: 1.31.0-rc.0~25540
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=0d43066e1871e5ca2b2cda196daf0785e0f9c320

Fix Bug 29102 - Upgrade fails "Unknown character set: 'mysql4'

Fix suggested by Tremault and tested by maanto.  Confirmed by me.
---

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index a2c0b18dab..7585fe7a59 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -174,7 +174,7 @@ class MysqlInstaller extends DatabaseInstaller {
 				$existingEngine = false;
 			} else {
 				if ( preg_match( '/^latin1/', $row->Collation ) ) {
-					$existingSchema = 'mysql4'; // TODO: This should go away/be dealt with
+					$existingSchema = 'latin1';
 				} elseif ( preg_match( '/^utf8/', $row->Collation ) ) {
 					$existingSchema = 'utf8';
 				} elseif ( preg_match( '/^binary/', $row->Collation ) ) {