diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
commit | 53aabda6b5ac6af989a97a00ff97efda9ff8772e (patch) | |
tree | 95867fd8cf7284dd7b2da1882182ceedffbbe683 /sql/rpl_parallel.cc | |
parent | f614b6ea6112c219581ffc35e753bc1dab48483a (diff) | |
parent | ba679ae52f0e9d698c1b36d28a5bc8c233e57a2e (diff) | |
download | mariadb-git-53aabda6b5ac6af989a97a00ff97efda9ff8772e.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r-- | sql/rpl_parallel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index ce612999eaf..4a15dd709db 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1777,7 +1777,7 @@ rpl_parallel_thread::inuse_relaylog_refcount_update() inuse_relaylog *ir= accumulated_ir_last; if (ir) { - my_atomic_add64(&ir->dequeued_count, accumulated_ir_count); + ir->dequeued_count+= accumulated_ir_count; accumulated_ir_count= 0; accumulated_ir_last= NULL; } |