summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-13 21:10:18 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-13 21:10:18 +0200
commita8446356373e84530a4c83759370178ec2bce571 (patch)
tree51b83e92f9aa489a3308a6ea66546e06ae025689 /sql/mysqld.h
parentaac3a1eac9f6aa347311e7cce7547e269bed5ea0 (diff)
downloadmariadb-git-a8446356373e84530a4c83759370178ec2bce571.tar.gz
use PSI wrappers in aria and other non-MySQL code
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index c23745d9d38..de2db372327 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -231,7 +231,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_prep_xids,
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,
+ key_LOCK_user_conn, key_LOG_LOCK_log,
key_master_info_data_lock, key_master_info_run_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,
@@ -267,10 +267,6 @@ extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_kill_server, key_thread_main,
key_thread_one_connection, key_thread_signal_hand;
-#ifdef HAVE_MMAP
-extern PSI_file_key key_file_map;
-#endif /* HAVE_MMAP */
-
extern PSI_file_key key_file_binlog, key_file_binlog_index, key_file_casetest,
key_file_dbopt, key_file_des_key_file, key_file_ERRMSG, key_select_to_file,
key_file_fileparser, key_file_frm, key_file_global_ddl_log, key_file_load,