diff options
| author | Monty <monty@mariadb.org> | 2017-01-29 23:44:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-28 16:10:46 +0100 |
| commit | c5e25c8b40e8c75d690dbc0e441abbefdd3cdcf4 (patch) | |
| tree | 498143cfbf5a6c80bd15a0f39a3d07f62e0aaa43 /sql/mysqld.h | |
| parent | e65f667bb60244610512efd7491fc77eccceb9db (diff) | |
| download | mariadb-git-c5e25c8b40e8c75d690dbc0e441abbefdd3cdcf4.tar.gz | |
Added a separate lock for start/stop/reset slave.
This solves some possible dead locks when one calls stop slave while slave
is starting.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index e7394230fe4..4538b7c4c70 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -266,7 +266,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list, key_LOCK_thd_data, key_LOCK_user_conn, key_LOG_LOCK_log, key_master_info_data_lock, key_master_info_run_lock, - key_master_info_sleep_lock, + key_master_info_sleep_lock, key_master_info_start_stop_lock, key_mutex_slave_reporting_capability_err_lock, key_relay_log_info_data_lock, key_relay_log_info_log_space_lock, key_relay_log_info_run_lock, key_rpl_group_info_sleep_lock, |