Ticket #5127: mysql_ grouping.patch

wp-admin/includes/schema.php

@@ -3 +3 @@
 
 $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) )

wp-admin/includes/upgrade.php

@@ -1239 +1239 @@
 }
 
 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 +1259 @@
         }
 }
 
-?>
+?>
+ No newline at end of file

wp-includes/wp-db.php

@@ -403 +403 @@
                         return false;
                 wp_die($message);
         }
+        
+        function server_version() {
+                return mysql_get_server_info();
+        }
+        
+        
 }
 
 if ( ! isset($wpdb) )