Index: /trunk/blog/checkup/index.php
===================================================================
--- /trunk/blog/checkup/index.php (revision 4563)
+++ /trunk/blog/checkup/index.php (revision 4654)
@@ -877,4 +877,15 @@
 }
 
+// From 1.6
+if (DBQuery::queryCell("DESC {$database['prefix']}Comments id", 'Extra') == 'auto_increment') {
+	$changed = true;
+	echo '<li>', _text('데이터베이스 호환성을 위하여 댓글 테이블의 자동 증가 설정을 제거합니다.'), ': ';
+	if (DBQuery::execute("ALTER TABLE {$database['prefix']}Comments CHANGE id id int(11) NOT NULL")
+		&& DBQuery::execute("ALTER TABLE {$database['prefix']}CommentsNotifiedQueue CHANGE id id int(11) NOT NULL")
+		&& DBQuery::execute("ALTER TABLE {$database['prefix']}CommentsNotifiedSiteInfo CHANGE id id int(11) NOT NULL"))
+		echo '<span style="color:#33CC33;">', _text('성공'), '</span></li>';
+	else
+		echo '<span style="color:#FF0066;">', _text('실패'), '</span></li>';
+}
 
 // Common parts.
Index: /trunk/lib/model/blog.comment.php
===================================================================
--- /trunk/lib/model/blog.comment.php (revision 4653)
+++ /trunk/lib/model/blog.comment.php (revision 4654)
@@ -382,10 +382,11 @@
 		$id = $insertId;
 		if ($parent != 'null' && $comment['secret'] < 1) {
+			$insertId = getCommentsNotifiedQueueMaxId();
 			DBQuery::execute("
 				INSERT INTO 
 					`{$database['prefix']}CommentsNotifiedQueue` 
-					( `blogid` , `commentId` , `sendStatus` , `checkDate` , `written` ) 
+					( `blogid` , `id`, `commentId` , `sendStatus` , `checkDate` , `written` ) 
 				VALUES 
-					($blogid , '" . $id . "', '0', '0', UNIX_TIMESTAMP());");
+					($blogid , $insertId, '" . $id . "', '0', '0', UNIX_TIMESTAMP());");
 		}
 		updateCommentsOfEntry($blogid, $comment['entry']);
@@ -809,7 +810,5 @@
 	$sql = "SELECT id FROM {$database['prefix']}CommentsNotifiedSiteInfo WHERE url = '$homepage'";
 	$siteId = DBQuery::queryCell($sql);
-	$maxId = DBQuery::queryCell("SELECT max(id)
-		FROM {$database['prefix']}CommentsNotifiedSiteInfo");
-	$insertId = empty($maxId) ? 1 : $maxId + 1;
+	$insertId = getCommentsNotifiedSiteInfoMaxId() + 1;
 	if (empty($siteId)) {
 		if (DBQuery::execute("INSERT INTO {$database['prefix']}CommentsNotifiedSiteInfo VALUES ($insertId, '$title', '$name', '$homepage', UNIX_TIMESTAMP());"))
@@ -882,3 +881,18 @@
 	return empty($maxId) ? 0 : $maxId;
 }
+
+function getCommentsNotifiedQueueMaxId() {
+	$maxId = DBQuery::queryCell("SELECT max(id) 
+		FROM {$database['prefix']}CommentsNotifiedQueue
+		WHERE blogid = ".getBlogId());
+	return empty($maxId) ? 0 : $maxId;
+}
+
+function getCommentsNotifiedSiteInfoMaxId() {
+	$maxId = DBQuery::queryCell("SELECT max(id) 
+		FROM {$database['prefix']}CommentsNotifiedSiteInfo
+		WHERE blogid = ".getBlogId());
+	return empty($maxId) ? 0 : $maxId;
+}
+
 ?>