summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-07-04 09:20:56 +0200
committerunknown <knielsen@knielsen-hq.org>2013-07-04 09:20:56 +0200
commita1cfd473469171e5a9700dbff0ee0e1eb84d6312 (patch)
tree026dad4ef4a445e81bb046d1c8c1e8c73fa1e0d6 /sql/mysqld.h
parent592e464a021747d7ac5b13222f5de1cd4250531c (diff)
downloadmariadb-git-a1cfd473469171e5a9700dbff0ee0e1eb84d6312.tar.gz
MDEV-4506: Parallel replication: Intermediate commit.
Wait for all worker threads to finish when stopping the SQL thread. (Only a basic wait; this still needs to be fixed to include timeout logic as in sql_slave_killed()).
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index d3b17cfefe1..3475835c67b 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -283,7 +283,8 @@ extern PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready,
key_COND_wait_commit;
extern PSI_cond_key key_RELAYLOG_COND_queue_busy;
extern PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy;
-extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool;
+extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool,
+ key_COND_parallel_entry;
extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_kill_server, key_thread_main,