diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 51cbe57fef..c14157058a 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -735,10 +735,10 @@ function upgrade_110() {
 	}
 
 	// Convert passwords to MD5 and update table appropiately
-	$query = 'DESCRIBE '.$wpdb->users.' user_pass';
-	$res = $wpdb->get_results($query);
-	if ($res[0]['Type'] != 'varchar(32)') {
-		$wpdb->query('ALTER TABLE '.$wpdb->users.' MODIFY user_pass varchar(64) not null');
+
+	$user_table = $wpdb->get_row("DESCRIBE $wpdb->users user_pass");
+	if ($user_table->Type != 'varchar(32)') {
+		$wpdb->query("ALTER TABLE $wpdb->users MODIFY user_pass varchar(64) not null");
 	}
 	
 	$query = 'SELECT ID, user_pass from '.$wpdb->users;