- Patch #43588 by killes: improved performance of taxonomy_get_tree.

4 files changed, 13 insertions, 2 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d67d4043d..85ffd71bf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,7 @@ Drupal x.x.x, xxxx-xx-xx (development version)
     * made it possible to alter, extend or theme forms.
 - comment system:
     * added support for "mass comment operations" to ease repetitive tasks.
+    * comment moderation has been removed.
 - node system:
     * reworked the revision functionality.
 - upgrade system:
diff --git a/database/database.mysql b/database/database.mysql
index 85c1a44d2..131b43940 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -712,7 +712,8 @@ CREATE TABLE term_hierarchy (
   tid int(10) unsigned NOT NULL default '0',
   parent int(10) unsigned NOT NULL default '0',
   KEY tid (tid),
-  KEY parent (parent)
+  KEY parent (parent),
+  PRIMARY KEY (tid, parent)
 ) TYPE=MyISAM;
 
 --
diff --git a/database/database.pgsql b/database/database.pgsql
index 3abb1fa1a..2bb1095d0 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -705,7 +705,8 @@ CREATE INDEX term_data_vid_idx ON term_data(vid);
 
 CREATE TABLE term_hierarchy (
   tid integer NOT NULL default '0',
-  parent integer NOT NULL default '0'
+  parent integer NOT NULL default '0',
+  PRIMARY KEY (tid, parent)
 );
 CREATE INDEX term_hierarchy_tid_idx ON term_hierarchy(tid);
 CREATE INDEX term_hierarchy_parent_idx ON term_hierarchy(parent);
diff --git a/database/updates.inc b/database/updates.inc
index 4728682a2..7b727f60a 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1421,3 +1421,11 @@ function system_update_167() {
 
   return $ret;
 }
+
+function system_update_168() {
+  $ret = array();
+
+  $ret[] = update_sql("ALTER TABLE {term_hierarchy} ADD PRIMARY KEY (tid, parent)");
+
+  return $ret;
+}