Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 6179)
+++ wp-admin/includes/schema.php	(working copy)
@@ -3,7 +3,7 @@
 
 $charset_collate = '';
 
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+if ( version_compare($wpdb->server_version(), '4.1.0', '>=') ) {
 	if ( ! empty($wpdb->charset) )
 		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
 	if ( ! empty($wpdb->collate) )
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 6179)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -1239,10 +1239,10 @@
 }
 
 function wp_check_mysql_version() {
-	global $wp_version;
+	global $wp_version, $wpdb;
 
 	// Make sure the server has MySQL 4.0
-	$mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info());
+	$mysql_version = preg_replace('|[^0-9\.]|', '', @$wpdb->server_version());
 	if ( version_compare($mysql_version, '4.0.0', '<') )
 		die(sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
 }
@@ -1259,4 +1259,4 @@
 	}
 }
 
-?>
+?>
\ No newline at end of file
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php	(revision 6179)
+++ wp-includes/wp-db.php	(working copy)
@@ -403,6 +403,12 @@
 			return false;
 		wp_die($message);
 	}
+	
+	function server_version() {
+		return mysql_get_server_info();
+	}
+	
+	
 }
 
 if ( ! isset($wpdb) )