From 15c0bca0e5797cbedecc269d52dd6e923deef7b3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 3 Dec 2015 15:33:36 +0300
Subject: [PATCH] catchup maybe add workaround for mysql 5.7 derived_merge

---
 include/functions.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 8d1c2a62..fb7b3244 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -1137,7 +1137,7 @@
 
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT id FROM
+								(SELECT DISTINCT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND feed_id IN
 											(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart) as tmp)");
@@ -1154,7 +1154,7 @@
 
 					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
-							(SELECT id FROM
+							(SELECT DISTINCT id FROM
 								(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = $owner_uid AND unread = true AND feed_id = $feed AND $date_qpart) as tmp)");
 
@@ -1163,7 +1163,7 @@
 					if ($feed == -1) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT id FROM
+								(SELECT DISTINCT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND marked = true AND $date_qpart) as tmp)");
 					}
@@ -1171,7 +1171,7 @@
 					if ($feed == -2) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT id FROM
+								(SELECT DISTINCT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND published = true AND $date_qpart) as tmp)");
 					}
@@ -1189,7 +1189,7 @@
 
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT id FROM
+								(SELECT DISTINCT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part) as tmp)");
 					}
@@ -1197,7 +1197,7 @@
 					if ($feed == -4) {
 						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
-								(SELECT id FROM
+								(SELECT DISTINCT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 										AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
 					}
@@ -1208,7 +1208,7 @@
 
 					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
-							(SELECT id FROM
+							(SELECT DISTINCT id FROM
 								(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
 									AND label_id = '$label_id' AND ref_id = article_id
 									AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
@@ -1220,7 +1220,7 @@
 			} else { // tag
 				db_query("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
-						(SELECT id FROM
+						(SELECT DISTINCT id FROM
 							(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
 								AND post_int_id = int_id AND tag_name = '$feed'
 								AND ttrss_user_entries.owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
-- 
2.39.5