diff -u comment_cck_orig/comment_cck.install comment_cck/comment_cck.install
--- comment_cck_orig/comment_cck.install	2008-09-23 23:52:31.000000000 +0100
+++ comment_cck/comment_cck.install	2008-09-23 23:53:09.000000000 +0100
@@ -15,7 +15,9 @@
         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;
 
     case 'pgsql':
diff -u comment_cck_orig/comment_cck.module comment_cck/comment_cck.module
--- comment_cck_orig/comment_cck.module	2008-09-23 23:52:31.000000000 +0100
+++ comment_cck/comment_cck.module	2008-09-23 23:53:41.000000000 +0100
@@ -115,7 +115,7 @@
         // We're gonna prepend to the comment, not append.
         $previous_text = $comment->comment;
         // Get the revisions associated with this 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));
         // The node that resulted from the update.
         $current_node = node_load((int) $comment_revision->nid, $comment_revision->vid);
         // The node, before the update.