diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
| commit | 0e7410a154560486ce4e0c975f122a0b15853bb1 (patch) | |
| tree | e65ba67f602f6c99a52a1953b2172043476a5930 /sql/mysqld.h | |
| parent | f398ced7f05e64b0f2bdb8e0a70de907aff9e1eb (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-0e7410a154560486ce4e0c975f122a0b15853bb1.tar.gz | |
Merge 10.0-base -> 10.0 (GTID).
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 7e4295365ce..0717bcff718 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -249,11 +249,14 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list, key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data, key_LOCK_error_messages, key_LOCK_thread_count, key_PARTITION_LOCK_auto_inc; extern PSI_mutex_key key_RELAYLOG_LOCK_index; +extern PSI_mutex_key key_LOCK_slave_state, key_LOCK_binlog_state; extern PSI_mutex_key key_LOCK_stats, key_LOCK_global_user_client_stats, key_LOCK_global_table_stats, key_LOCK_global_index_stats, key_LOCK_wakeup_ready; +extern PSI_mutex_key key_LOCK_gtid_counter, key_LOCK_rpl_gtid_state; + extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger, key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave, key_rwlock_LOCK_system_variables_hash, key_rwlock_query_cache_query_lock; @@ -295,6 +298,7 @@ extern PSI_file_key key_file_query_log, key_file_slow_log; extern PSI_file_key key_file_relaylog, key_file_relaylog_index; extern PSI_socket_key key_socket_tcpip, key_socket_unix, key_socket_client_connection; +extern PSI_file_key key_file_binlog_state; void init_server_psi_keys(); #endif /* HAVE_PSI_INTERFACE */ @@ -472,6 +476,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; +extern mysql_mutex_t LOCK_gtid_counter, LOCK_rpl_gtid_state; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; #ifdef HAVE_OPENSSL extern mysql_mutex_t LOCK_des_key_file; @@ -671,6 +676,7 @@ inline int set_current_thd(THD *thd) extern handlerton *maria_hton; extern uint extra_connection_count; +extern uint64 global_gtid_counter; extern my_bool opt_userstat_running, debug_assert_if_crashed_table; extern uint mysqld_extra_port; extern ulong opt_progress_report_time; |