Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.340
diff -u -p -r1.340 taxonomy.module
--- modules/taxonomy/taxonomy.module	15 Feb 2007 11:40:18 -0000	1.340
+++ modules/taxonomy/taxonomy.module	17 Feb 2007 22:05:15 -0000
@@ -1227,7 +1227,7 @@ function taxonomy_select_nodes($tids = a
     if ($operator == 'or') {
       $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
       $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n INNER JOIN {term_node} tn ON n.vid = t.vid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1 ORDER BY '. $order;
-      $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n INNER JOIN {term_node} tn ON n.vid = tn.vid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1';
+      $sql_count = 'SELECT COUNT(*) FROM {node} n INNER JOIN {term_node} tn ON n.vid = tn.vid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1 GROUP BY n.nid';
     }
     else {
       $joins = '';
@@ -1237,7 +1237,7 @@ function taxonomy_select_nodes($tids = a
         $wheres .= ' AND tn'. $index .'.tid IN ('. implode(',', $tids) .')';
       }
       $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres .' ORDER BY '. $order;
-      $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres;
+      $sql_count = 'SELECT COUNT(*) FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres . ' GROUP BY n.nid';
     }
     $sql = db_rewrite_sql($sql);
     $sql_count = db_rewrite_sql($sql_count);