diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-02-10 15:12:17 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-02-10 15:12:17 +0100 |
| commit | dd93ec5633c325748118ec8f23028715d1935820 (patch) | |
| tree | 29aa2272a2782792024a4d1fd79b845f72122b96 /sql/mysqld.h | |
| parent | e8193eeb8d90148f1cd46f085c96b2f3e3139d39 (diff) | |
| parent | f3a6f86ec3452b346de513075f72dbd02549a5fb (diff) | |
| download | mariadb-git-dd93ec5633c325748118ec8f23028715d1935820.tar.gz | |
Merge MariaDB 10.0-base to 10.0.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index dd80a6cf423..5e5eb16d7c3 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -267,6 +267,7 @@ extern PSI_mutex_key key_LOCK_slave_state, key_LOCK_binlog_state, extern PSI_mutex_key key_TABLE_SHARE_LOCK_share, key_LOCK_stats, key_LOCK_global_user_client_stats, key_LOCK_global_table_stats, key_LOCK_global_index_stats, key_LOCK_wakeup_ready, key_LOCK_wait_commit; +extern PSI_mutex_key key_LOCK_gtid_waiting; extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger, key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave, @@ -296,6 +297,7 @@ extern PSI_cond_key key_RELAYLOG_COND_queue_busy; extern PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy; extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool, key_COND_parallel_entry; +extern PSI_cond_key key_COND_wait_gtid; extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, key_thread_handle_manager, key_thread_kill_server, key_thread_main, @@ -434,6 +436,8 @@ extern PSI_stage_info stage_binlog_stopping_background_thread; extern PSI_stage_info stage_waiting_for_work_from_sql_thread; extern PSI_stage_info stage_waiting_for_prior_transaction_to_commit; extern PSI_stage_info stage_waiting_for_room_in_worker_thread; +extern PSI_stage_info stage_master_gtid_wait_primary; +extern PSI_stage_info stage_master_gtid_wait; #ifdef HAVE_PSI_STATEMENT_INTERFACE /** |