diff -u /root/comment_cck/comment_cck.install comment_cck/comment_cck.install
--- /root/comment_cck/comment_cck.install	2008-09-22 00:33:51.000000000 +0100
+++ comment_cck/comment_cck.install	2008-09-22 00:32:15.000000000 +0100
@@ -15,6 +15,8 @@
         previous_vid int NOT NULL,
         PRIMARY KEY (vid)
       ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE INDEX ix_comment_cck_revisions_cid ON comment_cck_revisions (cid);");
       
       break;
 
diff -u /root/comment_cck/comment_cck.module comment_cck/comment_cck.module
--- /root/comment_cck/comment_cck.module	2008-09-22 00:34:51.000000000 +0100
+++ comment_cck/comment_cck.module	2008-09-22 00:29:21.000000000 +0100
@@ -137,7 +137,7 @@
       if (variable_get('comment_cck_node_'. $node->type, FALSE) == TRUE) {
         $fields = variable_get('comment_cck_fields_'. $node->type, array());
         $previous_text = $comment->comment;
-        $comment_revision = db_fetch_object(db_query('SELECT * FROM {comment_cck_revisions} WHERE cid = %d', $comment->cid));
+        $comment_revision = db_fetch_object(db_query('SELECT cid, vid, nid, previous_vid FROM {comment_cck_revisions} WHERE cid = %d', $comment->cid));
         $current_node = _comment_cck_build_node((int) $comment_revision->nid, $comment_revision->vid);
         $previous_node = _comment_cck_build_node((int) $comment_revision->nid, $comment_revision->previous_vid);
         $cck_fields = content_types($node->type);