Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.191
diff -u -r1.191 updates.inc
--- database/updates.inc	23 Jan 2006 01:36:09 -0000	1.191
+++ database/updates.inc	25 Jan 2006 13:09:40 -0000
@@ -1491,10 +1491,11 @@
     }
 
     // See if database uses UTF-8 already
-    $url = parse_url($GLOBALS['db_url']);
+    global $db_url;
+    $url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
     $db_name = substr($url['path'], 1);
-    list(, $create) = db_fetch_array(db_query('SHOW CREATE DATABASE `%s`', $db_name));
-    if (preg_match('/utf8/i', $create)) {
+    $result = db_fetch_array(db_query('SHOW CREATE DATABASE `%s`', $db_name));
+    if (preg_match('/utf8/i', array_pop($result))) {
       return array();
     }
 
Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.48
diff -u -r1.48 database.mysql.inc
--- includes/database.mysql.inc	21 Jan 2006 01:42:52 -0000	1.48
+++ includes/database.mysql.inc	25 Jan 2006 13:09:41 -0000
@@ -77,12 +77,6 @@
   /* 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;
 }
Index: includes/database.mysqli.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysqli.inc,v
retrieving revision 1.11
diff -u -r1.11 database.mysqli.inc
--- includes/database.mysqli.inc	21 Jan 2006 01:42:52 -0000	1.11
+++ includes/database.mysqli.inc	25 Jan 2006 13:09:42 -0000
@@ -73,12 +73,6 @@
 
   /* Force UTF-8 */
   mysqli_query($connection, 'SET NAMES "utf8"');
-  mysqli_query($connection, 'SET collation_connection="utf8_general_ci"');
-  mysqli_query($connection, 'SET collation_server="utf8_general_ci"');
-  mysqli_query($connection, 'SET character_set_client="utf8"');
-  mysqli_query($connection, 'SET character_set_connection="utf8"');
-  mysqli_query($connection, 'SET character_set_results="utf8"');
-  mysqli_query($connection, 'SET character_set_server="utf8"');
 
   /**
    * from: http://bugs.php.net/bug.php?id=33772