Index: modules/forum/forum.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.install,v
retrieving revision 1.7
diff -u -r1.7 forum.install
--- modules/forum/forum.install	25 May 2007 12:46:44 -0000	1.7
+++ modules/forum/forum.install	30 May 2007 23:52:48 -0000
@@ -9,6 +9,12 @@
   drupal_install_schema('forum');
 }
 
+function forum_update_6001() {
+  $ret = array();
+    if (db_table_exists('forum')) {
+      db_add_index($ret, 'forum_topic', array('nid', 'tid'));
+}
+
 /**
  * Implementation of hook_uninstall().
  */
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.399
diff -u -r1.399 forum.module
--- modules/forum/forum.module	28 May 2007 06:19:05 -0000	1.399
+++ modules/forum/forum.module	29 May 2007 12:30:32 -0000
@@ -808,7 +808,7 @@
  * than NODE_NEW_LIMIT.
  */
 function _forum_topics_unread($term, $uid) {
-  $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
+  $sql = "SELECT COUNT(*) FROM {node} n INNER JOIN {forum} f ON n.nid = f.nid AND f.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.created > %d AND h.nid IS NULL";
   $sql = db_rewrite_sql($sql);
   return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
 }
Index: modules/forum/forum.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.schema,v
retrieving revision 1.1
diff -u -r1.1 forum.schema
--- modules/forum/forum.schema	25 May 2007 12:46:44 -0000	1.1
+++ modules/forum/forum.schema	29 May 2007 16:52:35 -0000
@@ -10,11 +10,11 @@
     ),
     'indexes' => array(
       'nid' => array('nid'),
-      'tid' => array('tid')
+      'tid' => array('tid'),
+      'forum_topic' => array('nid','tid')
     ),
     'primary key' => array('vid'),
   );
 
   return $schema;
-}
-
+}
\ No newline at end of file