diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-24 10:46:54 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-24 10:46:54 +0000 |
| commit | b299b9ee21b42a6cd43b58109a4382e346d58cdf (patch) | |
| tree | e10b1a16dda83d532bbdc7b5d4bb2498d6b2a2cf | |
| parent | 04daca23940e02ecc417b2f366759a1c80e1810d (diff) | |
| download | brdo-b299b9ee21b42a6cd43b58109a4382e346d58cdf.tar.gz brdo-b299b9ee21b42a6cd43b58109a4382e346d58cdf.tar.bz2 | |
#204411 by catch: elevate MySQL requirements to 4.1.1 (the first production MySQL 4.1.x was 4.1.5 anyway)
| -rw-r--r-- | INSTALL.txt | 2 | ||||
| -rw-r--r-- | includes/database.mysql.inc | 6 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/INSTALL.txt b/INSTALL.txt index 4f1f635fc..559133cef 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -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.postgresql.org/). The Apache web server and MySQL database are 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. For more detailed information about Drupal requirements, see "Requirements" diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index 0b2636c66..a71c2371a 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -80,10 +80,8 @@ function db_connect($url) { _db_error_page(mysql_error()); } - // On MySQL 4.1 and later, force UTF-8. - if (version_compare(mysql_get_server_info(), '4.1.0', '>=')) { - mysql_query('SET NAMES "utf8"', $connection); - } + // Force UTF-8. + mysql_query('SET NAMES "utf8"', $connection); return $connection; } diff --git a/modules/system/system.module b/modules/system/system.module index b35092fb2..1f1cac291 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -29,7 +29,7 @@ define('DRUPAL_MINIMUM_PHP_MEMORY_LIMIT', '16M'); /** * 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. |