Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into Ralith-fix_integrity_retry

2016-08-16 10:50:24 +01:00 · 2016-08-16 10:50:24 +01:00 · 6cbd1b495e
parent 75299af4fc 8a57cc3123
commit 6cbd1b495e
1 changed files with 2 additions and 1 deletions
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@ -600,7 +600,8 @@ class EventsStore(SQLBaseStore):
                "rejections",
                "redactions",
                "room_memberships",
-                "state_events"
+                "state_events",
+                "topics"
            ):
                txn.executemany(
                    "DELETE FROM %s WHERE event_id = ?" % (table,),