From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 9 Nov 2011 03:25:15 +0000 (+0000)
Subject: fix bug #29102: Upgrade fails "Unknown character set: 'mysql4'"
X-Git-Tag: 1.31.0-rc.0~26628
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=f9ff37c15360f227baff779d784fddd8803c56d1;p=lhc%2Fweb%2Fwiklou.git

fix bug #29102: Upgrade fails "Unknown character set: 'mysql4'"

by replacing "mysql4" with "binary"

Trivial enough to be backported, I think.
---

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 8d1a8110ac..734cdae3d9 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -799,6 +799,7 @@ class DatabaseMysql extends DatabaseBase {
 	protected function getDefaultSchemaVars() {
 		$vars = parent::getDefaultSchemaVars();
 		$vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] );
+		$vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $GLOBALS['wgDBTableOptions'] );
 		return $vars;
 	}