From b299b9ee21b42a6cd43b58109a4382e346d58cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Thu, 24 Jan 2008 10:46:54 +0000
Subject: [PATCH] #204411 by catch: elevate MySQL requirements to 4.1.1 (the
first production MySQL 4.1.x was 4.1.5 anyway)
---
INSTALL.txt | 2 +-
includes/database.mysql.inc | 6 ++----
modules/system/system.module | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/INSTALL.txt b/INSTALL.txt
index 4f1f635fc600..559133cef7f9 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 0b2636c66cd7..a71c2371a1dc 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 b35092fb2345..1f1cac291537 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -29,7 +29,7 @@
/**
* 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.
--
GitLab