diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 1634cfaea3..e402e904b4 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -81,7 +81,8 @@ CREATE TABLE $wpdb->comments (
   KEY comment_approved (comment_approved),
   KEY comment_post_ID (comment_post_ID),
   KEY comment_approved_date_gmt (comment_approved,comment_date_gmt),
-  KEY comment_date_gmt (comment_date_gmt)
+  KEY comment_date_gmt (comment_date_gmt),
+  KEY comment_parent (comment_parent)
 ) $charset_collate;
 CREATE TABLE $wpdb->links (
   link_id bigint(20) unsigned NOT NULL auto_increment,
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 811d1be667..b479ddf3e5 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1102,9 +1102,13 @@ function upgrade_290() {
  * @since 3.0.0
  */
 function upgrade_300() {
-	populate_roles_300();
-	if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) 
-		add_site_option( 'siteurl', '' );
+	global $wp_current_db_version;
+
+	if ( $wp_current_db_version < 12751 ) {
+		populate_roles_300();
+		if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) 
+			add_site_option( 'siteurl', '' );
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e14f2aca17..ada9fa35be 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -15,7 +15,7 @@ $wp_version = '3.0-alpha';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 12751;
+$wp_db_version = 13226;
 
 /**
  * Holds the TinyMCE version