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 a2c0b18..7585fe7 100644 (file)
--- 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 ) ) {