diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
commit | 4b3c3e526e7067da921d0aef8451b6e2736a5fe0 (patch) | |
tree | 40a6d851d7c39c443c587e29a725afda85c65929 /sql/wsrep_binlog.cc | |
parent | e7de50a82187cbaaa192c2065d64c0041cd9a6a1 (diff) | |
parent | 96f4b4a55b449a29af7e4b70bebf0ff238ae7f80 (diff) | |
download | mariadb-git-4b3c3e526e7067da921d0aef8451b6e2736a5fe0.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_binlog.cc')
-rw-r--r-- | sql/wsrep_binlog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc index 3fe0792d83e..bcc5d2fe46d 100644 --- a/sql/wsrep_binlog.cc +++ b/sql/wsrep_binlog.cc @@ -155,10 +155,10 @@ static int wsrep_write_cache_inc(THD* const thd, goto cleanup; cache->read_pos= cache->read_end; } while ((cache->file >= 0) && (length= my_b_fill(cache))); - } - if (ret == 0) - { - assert(total_length + thd->wsrep_sr().log_position() == saved_pos); + if (ret == 0) + { + assert(total_length + thd->wsrep_sr().log_position() == saved_pos); + } } cleanup: |