diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-09-09 12:15:53 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-09-09 12:15:53 +0200 |
| commit | ec47beaba6d3db86bf7eb75045a8d54d875d6962 (patch) | |
| tree | f48a3219e65d0c01b45713a2cb0915d5e06e7f8f /sql/mysqld.h | |
| parent | 06b7fce9f24116080168b924d17f71b979fc3a14 (diff) | |
| parent | 7e0c9de86484815b6e014ce3ad3e3a9b74ec0ce0 (diff) | |
| download | mariadb-git-ec47beaba6d3db86bf7eb75045a8d54d875d6962.tar.gz | |
Merge parallel replication async deadlock kill into 10.2.
Conflicts:
sql/mysqld.cc
sql/slave.cc
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 3356372d3d3..83d723c6ab7 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -342,8 +342,8 @@ extern PSI_cond_key key_COND_wait_gtid, key_COND_gtid_ignore_duplicates; extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, key_thread_handle_manager, key_thread_kill_server, key_thread_main, - key_thread_one_connection, key_thread_signal_hand, key_thread_slave_init, - key_rpl_parallel_thread; + key_thread_one_connection, key_thread_signal_hand, + key_thread_slave_background, key_rpl_parallel_thread; extern PSI_file_key key_file_binlog, key_file_binlog_index, key_file_casetest, key_file_dbopt, key_file_des_key_file, key_file_ERRMSG, key_select_to_file, @@ -489,6 +489,9 @@ extern PSI_stage_info stage_waiting_for_rpl_thread_pool; extern PSI_stage_info stage_master_gtid_wait_primary; extern PSI_stage_info stage_master_gtid_wait; extern PSI_stage_info stage_gtid_wait_other_connection; +extern PSI_stage_info stage_slave_background_process_request; +extern PSI_stage_info stage_slave_background_wait_request; +extern PSI_stage_info stage_waiting_for_deadlock_kill; #ifdef HAVE_PSI_STATEMENT_INTERFACE /** @@ -558,7 +561,7 @@ extern mysql_mutex_t LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_system_variables, LOCK_user_conn, LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count, - LOCK_slave_init; + LOCK_slave_background; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; extern mysql_mutex_t LOCK_start_thread; #ifdef HAVE_OPENSSL @@ -571,7 +574,7 @@ extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave; extern mysql_rwlock_t LOCK_system_variables_hash; extern mysql_cond_t COND_thread_count, COND_start_thread; extern mysql_cond_t COND_manager; -extern mysql_cond_t COND_slave_init; +extern mysql_cond_t COND_slave_background; extern int32 thread_running; extern int32 thread_count, service_thread_count; |