From cce8c9204541fe0da65dc7b33d31a34bf4ac5924 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 25 Nov 2011 00:16:34 +0000 Subject: [PATCH] Improve comment from r104047 Also bump MySQL min requirements to 5.0.2 to save an extra conditional >= 5.0.2 has been around ages.. --- includes/db/DatabaseMysql.php | 2 +- includes/installer/MysqlInstaller.php | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php index 5cc2e83836..54504db2b4 100644 --- a/includes/db/DatabaseMysql.php +++ b/includes/db/DatabaseMysql.php @@ -421,7 +421,7 @@ class DatabaseMysql extends DatabaseBase { /** * Returns slave lag. * - * On MySQL 4.1.9 and later, this will do a SHOW SLAVE STATUS + * This will do a SHOW SLAVE STATUS * * @return int */ diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 354fd43462..633ffcd3ca 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -32,7 +32,7 @@ class MysqlInstaller extends DatabaseInstaller { public $supportedEngines = array( 'InnoDB', 'MyISAM' ); - public $minimumVersion = '5.0.0'; + public $minimumVersion = '5.0.2'; public $webUserPrivs = array( 'DELETE', @@ -255,11 +255,6 @@ class MysqlInstaller extends DatabaseInstaller { */ $conn = $status->value; - // Check version, need INFORMATION_SCHEMA and CREATE USER - if ( version_compare( $conn->getServerVersion(), '5.0.2', '<' ) ) { - return false; - } - // Get current account name $currentName = $conn->selectField( '', 'CURRENT_USER()', '', __METHOD__ ); $parts = explode( '@', $currentName ); @@ -631,7 +626,7 @@ class MysqlInstaller extends DatabaseInstaller { # MySQL table options to use during installation or update \$wgDBTableOptions = \"{$tblOpts}\"; -# Experimental charset support for MySQL 4.1/5.0. +# Experimental charset support for MySQL 5.0. \$wgDBmysql5 = {$dbmysql5};"; } } -- 2.20.1