summaryrefslogtreecommitdiff
path: root/sql/rpl_parallel.cc
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2014-11-13 09:56:28 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2014-11-13 09:56:28 +0100
commita98a034c5e8bd4cac8794bb59e6fce138344ce0c (patch)
tree267a8234eb324758e2b688929c153e14aaea6a35 /sql/rpl_parallel.cc
parentecc33da2caff0dfbd13d68931c1f4cf151b74cda (diff)
downloadmariadb-git-a98a034c5e8bd4cac8794bb59e6fce138344ce0c.tar.gz
MDEV-7102: Incorrect PSI_stage_info message in SHOW PROCESSLIST during parallel replication
In parallel replication, threads can do two different waits for a prior transaction. One is for the prior transaction to start commit, the other is for it to complete commit. It turns out that the same PSI_stage_info message was errorneously used in both cases (probably a merge error), causing SHOW PROCESSLIST to be misleading. Fix by using correct, distinct message in each case.
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r--sql/rpl_parallel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc
index cda224ff01b..c26469acb78 100644
--- a/sql/rpl_parallel.cc
+++ b/sql/rpl_parallel.cc
@@ -656,7 +656,7 @@ handle_rpl_parallel_thread(void *arg)
DEBUG_SYNC(thd, "rpl_parallel_start_waiting_for_prior");
thd->ENTER_COND(&gco->COND_group_commit_orderer,
&entry->LOCK_parallel_entry,
- &stage_waiting_for_prior_transaction_to_commit,
+ &stage_waiting_for_prior_transaction_to_start_commit,
&old_stage);
did_enter_cond= true;
do