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 8d1a811..734cdae 100644 (file)
--- 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;
        }