summaryrefslogtreecommitdiff
path: root/sql/rpl_parallel.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-09-08 12:59:57 +0200
committerSergei Golubchik <sergii@pisem.net>2014-09-08 12:59:57 +0200
commit4d4ce59d2be82a1a0aebe8d527da1e660395c063 (patch)
treee7c745ca4a7385a3b1a8006078b5b6428dd4fcf8 /sql/rpl_parallel.cc
parentefc93eb3d1ec33d9f9357872c70b4044f26e7785 (diff)
downloadmariadb-git-4d4ce59d2be82a1a0aebe8d527da1e660395c063.tar.gz
compilation fixes for WITH_ATOMIC_OPS=rwlocks
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r--sql/rpl_parallel.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc
index 038abb351ea..cda224ff01b 100644
--- a/sql/rpl_parallel.cc
+++ b/sql/rpl_parallel.cc
@@ -4,7 +4,6 @@
#include "rpl_mi.h"
#include "debug_sync.h"
-
/*
Code for optional parallel execution of replicated events on the slave.
*/
@@ -844,9 +843,9 @@ handle_rpl_parallel_thread(void *arg)
{
if (last_ir)
{
- my_atomic_rwlock_wrlock(&rli->inuse_relaylog_atomic_lock);
+ my_atomic_rwlock_wrlock(&last_ir->inuse_relaylog_atomic_lock);
my_atomic_add64(&last_ir->dequeued_count, accumulated_ir_count);
- my_atomic_rwlock_wrunlock(&rli->inuse_relaylog_atomic_lock);
+ my_atomic_rwlock_wrunlock(&last_ir->inuse_relaylog_atomic_lock);
accumulated_ir_count= 0;
}
last_ir= ir;
@@ -857,9 +856,9 @@ handle_rpl_parallel_thread(void *arg)
}
if (last_ir)
{
- my_atomic_rwlock_wrlock(&rli->inuse_relaylog_atomic_lock);
+ my_atomic_rwlock_wrlock(&last_ir->inuse_relaylog_atomic_lock);
my_atomic_add64(&last_ir->dequeued_count, accumulated_ir_count);
- my_atomic_rwlock_wrunlock(&rli->inuse_relaylog_atomic_lock);
+ my_atomic_rwlock_wrunlock(&last_ir->inuse_relaylog_atomic_lock);
}
if ((events= rpt->event_queue) != NULL)