Index: modules/apachesolr/apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.34
diff -u -r1.1.2.34 apachesolr.module
--- modules/apachesolr/apachesolr.module	17 Sep 2008 04:35:06 -0000	1.1.2.34
+++ modules/apachesolr/apachesolr.module	17 Sep 2008 15:30:00 -0000
@@ -258,8 +258,8 @@
     $result = db_query_range('SELECT GREATEST(IF(c.last_comment_timestamp IS NULL, 0, c.last_comment_timestamp), n.changed) as last_change, n.nid '.
                              'FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid '.
                              'WHERE n.status = 1 '.
-                             '  AND ((GREATEST(n.changed, c.last_comment_timestamp) = %d AND n.nid > %d) OR (n.changed > %d OR c.last_comment_timestamp > %d)) '.
-                             'ORDER BY GREATEST(n.changed, c.last_comment_timestamp) ASC, n.nid ASC', $cron_change, $cron_last, $cron_change, $cron_change, $cron_change, 0, $cron_limit);
+                             'AND ((GREATEST(IF(c.last_comment_timestamp IS NULL , 0, c.last_comment_timestamp ), n.changed) = %d AND n.nid > %d) OR n.changed > %d OR c.last_comment_timestamp > %d) ' . 
+                             'ORDER BY last_change ASC, n.nid ASC', $cron_change, $cron_last, $cron_change, $cron_change, 0, $cron_limit);
     return $result;
   }