diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-12 17:03:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-13 10:15:21 +0100 |
| commit | e695db0f2d97cbba2832e0f3dc25af5add1f16ac (patch) | |
| tree | 7c03822a83a0b16ae513b22659b9ac43068b0411 /sql/rpl_parallel.cc | |
| parent | 1f0ad6c6b3421a815ea6373c66aaf693852342cf (diff) | |
| download | mariadb-git-e695db0f2d97cbba2832e0f3dc25af5add1f16ac.tar.gz | |
MDEV-7437 remove suport for "atomics" with rwlocks
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 89d9289d166..62842810797 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -47,8 +47,7 @@ rpt_handle_event(rpl_parallel_thread::queued_event *qev, /* Mutex will be released in apply_event_and_update_pos(). */ err= apply_event_and_update_pos(ev, thd, rgi, rpt); - thread_safe_increment64(&rli->executed_entries, - &slave_executed_entries_lock); + thread_safe_increment64(&rli->executed_entries); /* ToDo: error handling. */ return err; } @@ -1193,9 +1192,7 @@ rpl_parallel_thread::inuse_relaylog_refcount_update() inuse_relaylog *ir= accumulated_ir_last; if (ir) { - my_atomic_rwlock_wrlock(&ir->rli->inuse_relaylog_atomic_lock); my_atomic_add64(&ir->dequeued_count, accumulated_ir_count); - my_atomic_rwlock_wrunlock(&ir->rli->inuse_relaylog_atomic_lock); accumulated_ir_count= 0; accumulated_ir_last= NULL; } |