From a1cfd473469171e5a9700dbff0ee0e1eb84d6312 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Jul 2013 09:20:56 +0200 Subject: 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()). --- sql/mysqld.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sql/mysqld.cc') 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, -- cgit v1.2.1