Merge remote-tracking branch 'upstream/release-v1.59'

This commit is contained in:
Tulir Asokan 2022-05-17 12:35:23 +03:00
commit ec744293f8
4 changed files with 22 additions and 4 deletions

View file

@ -750,7 +750,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
WHERE room_id = ?
AND stream_ordering <= ?
AND NOT outlier
AND rejections.reason IS NULL
AND rejections.event_id IS NULL
ORDER BY stream_ordering DESC
LIMIT 1
"""