Changes from trunk/wp-admin/includes/upgrade.php at r6158 to branches/2.3/wp-admin/includes/upgrade.php at r6268

File:

• branches/2.3/wp-admin/includes/upgrade.php (modified) (5 diffs)

branches/2.3/wp-admin/includes/upgrade.php

@@ -534 +534 @@
     // Convert categories to terms.
     $tt_ids = array();
+    $have_tags = false;
     $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID");
     foreach ($categories as $category) {
@@ -580 +581 @@
 
         if ( !empty($category->tag_count) ) {
+            $have_tags = true;
             $count = (int) $category->tag_count;
             $taxonomy = 'post_tag';
@@ -594 +596 @@
     }
 
-    $posts = $wpdb->get_results("SELECT * FROM $wpdb->post2cat");
+    $select = 'post_id, category_id';
+    if ( $have_tags )
+        $select .= ', rel_type';
+
+    $posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
     foreach ( $posts as $post ) {
         $post_id = (int) $post->post_id;
@@ -659 +665 @@
         update_option('default_link_category', $default_link_cat);
     } else {
-        $links = $wpdb->get_results("SELECT * FROM $wpdb->link2cat");
+        $links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
         foreach ( $links as $link ) {
             $link_id = (int) $link->link_id;
@@ -1003 +1009 @@
                         // Add the column list to the index create string
                         $index_string .= ' ('.$index_columns.')';
-                        error_log("Index string: $index_string", 0);
                         if(!(($aindex = array_search($index_string, $indices)) === false)) {
                             unset($indices[$aindex]);