diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2014-12-29 15:41:08 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2014-12-29 15:41:08 +0400 |
| commit | dc92032fa33cc1f3bc7fb0f885433826246bcdc0 (patch) | |
| tree | c5a3e5aac7e8ca6785bb3fdf2eb7c1fce4afd54a /sql/mysqld.cc | |
| parent | 6dbc48ca79e5fdd8d4022b00b862e08a4198155b (diff) | |
| download | mariadb-git-bb-power.tar.gz | |
Fixed sysvars_server_embedded test result to reflect new values forbb-power
query_prealloc_size, query_alloc_block_size and log_tc_size.
Fixed incorrect registration of LOCK_binlog_end_pos in PFS.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9fcb382df70..27f1b5be1f5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -861,6 +861,7 @@ PSI_mutex_key key_LOCK_des_key_file; PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list, key_BINLOG_LOCK_binlog_background_thread, + m_key_LOCK_binlog_end_pos, key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi, key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create, key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log, @@ -912,6 +913,7 @@ static PSI_mutex_info all_server_mutexes[]= { &key_BINLOG_LOCK_index, "MYSQL_BIN_LOG::LOCK_index", 0}, { &key_BINLOG_LOCK_xid_list, "MYSQL_BIN_LOG::LOCK_xid_list", 0}, { &key_BINLOG_LOCK_binlog_background_thread, "MYSQL_BIN_LOG::LOCK_binlog_background_thread", 0}, + { &m_key_LOCK_binlog_end_pos, "MYSQL_BIN_LOG::LOCK_binlog_end_pos", 0 }, { &key_RELAYLOG_LOCK_index, "MYSQL_RELAY_LOG::LOCK_index", 0}, { &key_delayed_insert_mutex, "Delayed_insert::mutex", 0}, { &key_hash_filo_lock, "hash_filo::lock", 0}, |