From d85d717aedbc7690e2a450e40dab8fcebd94b38c Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 30 Oct 2007 16:49:38 +0000
Subject: Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/includes/upgrade.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'wp-admin/includes/upgrade.php')

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index b30daef..797e6e7 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1253,10 +1253,12 @@ function translate_level_to_role($level) {
 }
 
 function wp_check_mysql_version() {
-	global $wpdb;
-	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
+	global $wp_version;
+
+	// Make sure the server has MySQL 4.0
+	$mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info());
+	if ( version_compare($mysql_version, '4.0.0', '<') )
+		die(sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
 }
 
 function maybe_disable_automattic_widgets() {
-- 
cgit