summaryrefslogtreecommitdiff
path: root/includes/database.mysql.inc
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2006-02-02 01:27:57 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2006-02-02 01:27:57 +0000
commitd96be836c15c5dc20b380fe34fd4fdd334f55b11 (patch)
tree59b5791767e052d2c5e44aa4bc47403a3e842b59 /includes/database.mysql.inc
parentdcb092e62749835977a6c77087f9d7791bf707f8 (diff)
downloadbrdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.gz
brdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.bz2
- #40515: MySQL UTF-8 conversion fixes
Diffstat (limited to 'includes/database.mysql.inc')
-rw-r--r--includes/database.mysql.inc6
1 files changed, 0 insertions, 6 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 8ee51bbe1..fd8dd4b37 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -83,12 +83,6 @@ function db_connect($url) {
/* 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);
- mysql_query('SET collation_connection="utf8_general_ci"', $connection);
- mysql_query('SET collation_server="utf8_general_ci"', $connection);
- mysql_query('SET character_set_client="utf8"', $connection);
- mysql_query('SET character_set_connection="utf8"', $connection);
- mysql_query('SET character_set_results="utf8"', $connection);
- mysql_query('SET character_set_server="utf8"', $connection);
}
return $connection;
}