diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
| commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
| tree | a4d892b86aa46927978f82976fff61f1e5193383 /sql/mysqld.h | |
| parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
| parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
| download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz | |
merge with mysql-5.5.21
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index db7857d9cd5..988584f779a 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -172,6 +172,7 @@ extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size, max_relay_log_size; extern ulong opt_binlog_rows_event_max_size; extern ulong rpl_recovery_rank, thread_cache_size; +extern ulong stored_program_cache_size; extern ulong back_log; extern char language[FN_REFLEN]; extern "C" MYSQL_PLUGIN_IMPORT ulong server_id; @@ -234,8 +235,10 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_prep_xids, key_LOCK_table_share, 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_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_relay_log_info_sleep_lock, 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; @@ -258,8 +261,10 @@ extern PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, 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, + key_master_info_sleep_cond, key_relay_log_info_data_cond, key_relay_log_info_log_space_cond, key_relay_log_info_start_cond, key_relay_log_info_stop_cond, + key_relay_log_info_sleep_cond, key_TABLE_SHARE_cond, key_user_level_lock_cond, key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache; extern PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready; |