diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-07-04 09:20:56 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-07-04 09:20:56 +0200 |
| commit | a1cfd473469171e5a9700dbff0ee0e1eb84d6312 (patch) | |
| tree | 026dad4ef4a445e81bb046d1c8c1e8c73fa1e0d6 /sql/mysqld.cc | |
| parent | 592e464a021747d7ac5b13222f5de1cd4250531c (diff) | |
| download | mariadb-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.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 52c754993ac..816756338a4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -894,7 +894,8 @@ PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready, key_COND_wait_commit; PSI_cond_key key_RELAYLOG_COND_queue_busy; PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy; -PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool; +PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool, + key_COND_parallel_entry; static PSI_cond_info all_server_conds[]= { @@ -938,7 +939,8 @@ static PSI_cond_info all_server_conds[]= { &key_COND_thread_cache, "COND_thread_cache", PSI_FLAG_GLOBAL}, { &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL}, { &key_COND_rpl_thread, "COND_rpl_thread", 0}, - { &key_COND_rpl_thread_pool, "COND_rpl_thread_pool", 0} + { &key_COND_rpl_thread_pool, "COND_rpl_thread_pool", 0}, + { &key_COND_parallel_entry, "COND_parallel_entry", 0} }; PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, |