summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
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/mysqld.h
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/mysqld.h')
-rw-r--r--sql/mysqld.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 90cad2a604f..d66ea8f2e97 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -448,6 +448,7 @@ extern PSI_stage_info stage_binlog_processing_checkpoint_notify;
extern PSI_stage_info stage_binlog_stopping_background_thread;
extern PSI_stage_info stage_waiting_for_work_from_sql_thread;
extern PSI_stage_info stage_waiting_for_prior_transaction_to_commit;
+extern PSI_stage_info stage_waiting_for_prior_transaction_to_start_commit;
extern PSI_stage_info stage_waiting_for_room_in_worker_thread;
extern PSI_stage_info stage_master_gtid_wait_primary;
extern PSI_stage_info stage_master_gtid_wait;