diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:59:17 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:59:17 +0100 |
| commit | 462e681c792e2fce6769ef80d11045da11fb0842 (patch) | |
| tree | 72c2acacc8ec9e3c1220e5d4151daae2436482eb /synapse/storage | |
| parent | Include a public_baseurl in configs generated by the demo script. (#8443) (diff) | |
| parent | move #8444 to 'feature' (diff) | |
| download | synapse-462e681c792e2fce6769ef80d11045da11fb0842.tar.xz | |
Merge tag 'v1.21.0rc2' into develop
Synapse 1.21.0rc2 (2020-10-02) ============================== Features -------- - Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444)) Bugfixes -------- - Fix a regression in v1.21.0rc1 which broke thumbnails of remote media. ([\#8438](https://github.com/matrix-org/synapse/issues/8438)) - Do not expose the experimental `uk.half-shot.msc2778.login.application_service` flow in the login API, which caused a compatibility problem with Element iOS. ([\#8440](https://github.com/matrix-org/synapse/issues/8440)) - Fix malformed log line in new federation "catch up" logic. ([\#8442](https://github.com/matrix-org/synapse/issues/8442)) - Fix DB query on startup for negative streams which caused long start up times. Introduced in [\#8374](https://github.com/matrix-org/synapse/issues/8374). ([\#8447](https://github.com/matrix-org/synapse/issues/8447))
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/util/id_generators.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/util/id_generators.py b/synapse/storage/util/id_generators.py index ec356b2e4f..c92cd4a6ba 100644 --- a/synapse/storage/util/id_generators.py +++ b/synapse/storage/util/id_generators.py @@ -341,7 +341,7 @@ class MultiWriterIdGenerator: "cmp": "<=" if self._positive else ">=", } sql = self._db.engine.convert_param_style(sql) - cur.execute(sql, (min_stream_id,)) + cur.execute(sql, (min_stream_id * self._return_factor,)) self._persisted_upto_position = min_stream_id |