From 1ee019e728d5b7add2fc8352e6a8dce22d68161b Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 23 Nov 2011 16:21:57 +0000 Subject: [PATCH] Kill some more mysql 4 related things from the installer * (bug 32217) Drop MySQL 4 support --- includes/installer/MysqlInstaller.php | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index eed004a5e3..e478a19256 100644 --- 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' ); } /** -- 2.20.1