diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
| commit | f0fe6e4dac44c9555de1193990e9d2cbc77be62e (patch) | |
| tree | 0a5202757c09044f2c476f93621c75c9df31e32d /sql/mysqld.h | |
| parent | b7ed981f3793b4464b99c98b7baa3c511b52b6a5 (diff) | |
| parent | 9ab0759ea4534c1581dfb62f2f7e3a6e06d3c3c3 (diff) | |
| download | mariadb-git-f0fe6e4dac44c9555de1193990e9d2cbc77be62e.tar.gz | |
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 5350602d435..6e81c240f7d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -229,7 +229,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_prep_xids, key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log, key_LOCK_gdl, key_LOCK_global_read_lock, key_LOCK_global_system_variables, key_LOCK_logger, key_LOCK_manager, - key_LOCK_open, key_LOCK_prepared_stmt_count, + key_LOCK_prepared_stmt_count, key_LOCK_rpl_status, key_LOCK_server_started, key_LOCK_status, key_LOCK_table_share, key_LOCK_thd_data, key_LOCK_user_conn, key_LOCK_uuid_generator, key_LOG_LOCK_log, @@ -249,7 +249,7 @@ extern PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool; extern PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, key_COND_cache_status_changed, key_COND_global_read_lock, key_COND_manager, - key_COND_refresh, key_COND_rpl_status, key_COND_server_started, + key_COND_rpl_status, key_COND_server_started, key_delayed_insert_cond, key_delayed_insert_cond_client, key_item_func_sleep_cond, key_master_info_data_cond, key_master_info_start_cond, key_master_info_stop_cond, @@ -316,7 +316,7 @@ extern MYSQL_PLUGIN_IMPORT key_map key_map_full; /* Should be threaded /* Server mutex locks and condition variables. */ -extern mysql_mutex_t LOCK_open, +extern mysql_mutex_t LOCK_user_locks, LOCK_status, LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, @@ -332,7 +332,7 @@ extern mysql_cond_t COND_server_started; 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; -extern mysql_cond_t COND_refresh, COND_manager; +extern mysql_cond_t COND_manager; extern mysql_cond_t COND_global_read_lock; extern int32 thread_running; extern my_atomic_rwlock_t thread_running_lock; |