#204411 by catch: elevate MySQL requirements to 4.1.1 (the first production MySQL 4.1.x was 4.1.5 anyway)

6.x
Gábor Hojtsy 2008-01-24 10:46:54 +00:00
parent 04daca2394
commit b299b9ee21
3 changed files with 4 additions and 6 deletions

View File

@ -18,7 +18,7 @@ Drupal requires a web server, PHP 4 (4.3.5 or greater) or PHP 5
(http://www.php.net/) and either MySQL (http://www.mysql.com/) or PostgreSQL (http://www.php.net/) and either MySQL (http://www.mysql.com/) or PostgreSQL
(http://www.postgresql.org/). The Apache web server and MySQL database are (http://www.postgresql.org/). The Apache web server and MySQL database are
recommended; other web server and database combinations such as IIS and recommended; other web server and database combinations such as IIS and
PostgreSQL have been tested to a lesser extent. When using MySQL, version 4.1 PostgreSQL have been tested to a lesser extent. When using MySQL, version 4.1.1
or greater is recommended to assure you can safely transfer the database. or greater is recommended to assure you can safely transfer the database.
For more detailed information about Drupal requirements, see "Requirements" For more detailed information about Drupal requirements, see "Requirements"

View File

@ -80,10 +80,8 @@ function db_connect($url) {
_db_error_page(mysql_error()); _db_error_page(mysql_error());
} }
// On MySQL 4.1 and later, force UTF-8. // Force UTF-8.
if (version_compare(mysql_get_server_info(), '4.1.0', '>=')) {
mysql_query('SET NAMES "utf8"', $connection); mysql_query('SET NAMES "utf8"', $connection);
}
return $connection; return $connection;
} }

View File

@ -29,7 +29,7 @@ define('DRUPAL_MINIMUM_PHP_MEMORY_LIMIT', '16M');
/** /**
* Minimum supported version of MySQL, if it is used. * Minimum supported version of MySQL, if it is used.
*/ */
define('DRUPAL_MINIMUM_MYSQL', '4.1.0'); define('DRUPAL_MINIMUM_MYSQL', '4.1.1');
/** /**
* Minimum supported version of PostgreSQL, if it is used. * Minimum supported version of PostgreSQL, if it is used.