Kill some more mysql 4 related things from the installer

* (bug 32217) Drop MySQL 4 support

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index eed004a..e478a19 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -213,22 +213,13 @@ class MysqlInstaller extends DatabaseInstaller {
         * @return array
         */
        public function getEngines() {
-               $engines = array( 'InnoDB', 'MyISAM' );
                $status = $this->getConnection();
-               if ( !$status->isOK() ) {
-                       return $engines;
-               }
+
                /**
                 * @var $conn DatabaseBase
                 */
                $conn = $status->value;
 
-               $version = $conn->getServerVersion();
-               if ( version_compare( $version, "4.1.2", "<" ) ) {
-                       // No SHOW ENGINES in this version
-                       return $engines;
-               }
-
                $engines = array();
                $res = $conn->query( 'SHOW ENGINES', __METHOD__ );
                foreach ( $res as $row ) {
@@ -246,16 +237,7 @@ class MysqlInstaller extends DatabaseInstaller {
         * @return array
         */
        public function getCharsets() {
-               $status = $this->getConnection();
-               $mysql5 = array( 'binary', 'utf8' );
-               $mysql4 = array( 'mysql4' );
-               if ( !$status->isOK() ) {
-                       return $mysql5;
-               }
-               if ( version_compare( $status->value->getServerVersion(), '4.1.0', '>=' ) ) {
-                       return $mysql5;
-               }
-               return $mysql4;
+               return array( 'binary', 'utf8' );
        }
 
        /**