| Index: trunk/phase3/includes/installer/MysqlInstaller.php |
| — | — | @@ -213,22 +213,13 @@ |
| 214 | 214 | * @return array |
| 215 | 215 | */ |
| 216 | 216 | public function getEngines() { |
| 217 | | - $engines = array( 'InnoDB', 'MyISAM' ); |
| 218 | 217 | $status = $this->getConnection(); |
| 219 | | - if ( !$status->isOK() ) { |
| 220 | | - return $engines; |
| 221 | | - } |
| | 218 | + |
| 222 | 219 | /** |
| 223 | 220 | * @var $conn DatabaseBase |
| 224 | 221 | */ |
| 225 | 222 | $conn = $status->value; |
| 226 | 223 | |
| 227 | | - $version = $conn->getServerVersion(); |
| 228 | | - if ( version_compare( $version, "4.1.2", "<" ) ) { |
| 229 | | - // No SHOW ENGINES in this version |
| 230 | | - return $engines; |
| 231 | | - } |
| 232 | | - |
| 233 | 224 | $engines = array(); |
| 234 | 225 | $res = $conn->query( 'SHOW ENGINES', __METHOD__ ); |
| 235 | 226 | foreach ( $res as $row ) { |
| — | — | @@ -246,16 +237,7 @@ |
| 247 | 238 | * @return array |
| 248 | 239 | */ |
| 249 | 240 | public function getCharsets() { |
| 250 | | - $status = $this->getConnection(); |
| 251 | | - $mysql5 = array( 'binary', 'utf8' ); |
| 252 | | - $mysql4 = array( 'mysql4' ); |
| 253 | | - if ( !$status->isOK() ) { |
| 254 | | - return $mysql5; |
| 255 | | - } |
| 256 | | - if ( version_compare( $status->value->getServerVersion(), '4.1.0', '>=' ) ) { |
| 257 | | - return $mysql5; |
| 258 | | - } |
| 259 | | - return $mysql4; |
| | 241 | + return array( 'binary', 'utf8' ); |
| 260 | 242 | } |
| 261 | 243 | |
| 262 | 244 | /** |