use PSI wrappers in aria and other non-MySQL code

4 files changed, 172 insertions, 2 deletions

diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result
new file mode 100644
index 00000000000..5f844e6dd3b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/all_instances.result
@@ -0,0 +1,149 @@
+use performance_schema;
+select name from mutex_instances group by name;
+name
+wait/synch/mutex/archive/archive_mutex
+wait/synch/mutex/aria/LOCK_trn_list
+wait/synch/mutex/aria/PAGECACHE::cache_lock
+wait/synch/mutex/aria/SERVICE_THREAD_CONTROL::LOCK_control
+wait/synch/mutex/aria/THR_LOCK_maria
+wait/synch/mutex/aria/TRANSLOG_BUFFER::mutex
+wait/synch/mutex/aria/TRANSLOG_DESCRIPTOR::dirty_buffer_mask_lock
+wait/synch/mutex/aria/TRANSLOG_DESCRIPTOR::file_header_lock
+wait/synch/mutex/aria/TRANSLOG_DESCRIPTOR::log_flush_lock
+wait/synch/mutex/aria/TRANSLOG_DESCRIPTOR::purger_lock
+wait/synch/mutex/aria/TRANSLOG_DESCRIPTOR::unfinished_files_lock
+wait/synch/mutex/blackhole/blackhole
+wait/synch/mutex/csv/tina
+wait/synch/mutex/memory/HP_SHARE::intern_lock
+wait/synch/mutex/myisam/MYISAM_SHARE::intern_lock
+wait/synch/mutex/mysys/BITMAP::mutex
+wait/synch/mutex/mysys/KEY_CACHE::cache_lock
+wait/synch/mutex/mysys/LOCK_alarm
+wait/synch/mutex/mysys/LOCK_uuid_generator
+wait/synch/mutex/mysys/my_thread_var::mutex
+wait/synch/mutex/mysys/THR_LOCK::mutex
+wait/synch/mutex/mysys/THR_LOCK_charset
+wait/synch/mutex/mysys/THR_LOCK_heap
+wait/synch/mutex/mysys/THR_LOCK_isam
+wait/synch/mutex/mysys/THR_LOCK_malloc
+wait/synch/mutex/mysys/THR_LOCK_myisam
+wait/synch/mutex/mysys/THR_LOCK_net
+wait/synch/mutex/mysys/THR_LOCK_open
+wait/synch/mutex/mysys/THR_LOCK_threads
+wait/synch/mutex/mysys/TMPDIR_mutex
+wait/synch/mutex/sql/Cversion_lock
+wait/synch/mutex/sql/DEBUG_SYNC::mutex
+wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state
+wait/synch/mutex/sql/hash_filo::lock
+wait/synch/mutex/sql/LOCK_active_mi
+wait/synch/mutex/sql/LOCK_audit_mask
+wait/synch/mutex/sql/LOCK_connection_count
+wait/synch/mutex/sql/LOCK_crypt
+wait/synch/mutex/sql/LOCK_delayed_create
+wait/synch/mutex/sql/LOCK_delayed_insert
+wait/synch/mutex/sql/LOCK_delayed_status
+wait/synch/mutex/sql/LOCK_des_key_file
+wait/synch/mutex/sql/LOCK_error_log
+wait/synch/mutex/sql/LOCK_error_messages
+wait/synch/mutex/sql/LOCK_event_queue
+wait/synch/mutex/sql/LOCK_gdl
+wait/synch/mutex/sql/LOCK_global_index_stats
+wait/synch/mutex/sql/LOCK_global_system_variables
+wait/synch/mutex/sql/LOCK_global_table_stats
+wait/synch/mutex/sql/LOCK_global_user_client_stats
+wait/synch/mutex/sql/LOCK_manager
+wait/synch/mutex/sql/LOCK_open
+wait/synch/mutex/sql/LOCK_plugin
+wait/synch/mutex/sql/LOCK_prepared_stmt_count
+wait/synch/mutex/sql/LOCK_rpl_status
+wait/synch/mutex/sql/LOCK_server_started
+wait/synch/mutex/sql/LOCK_slave_list
+wait/synch/mutex/sql/LOCK_stats
+wait/synch/mutex/sql/LOCK_status
+wait/synch/mutex/sql/LOCK_thread_count
+wait/synch/mutex/sql/LOCK_user_conn
+wait/synch/mutex/sql/LOCK_user_locks
+wait/synch/mutex/sql/LOCK_uuid_generator
+wait/synch/mutex/sql/LOCK_xid_cache
+wait/synch/mutex/sql/LOG::LOCK_log
+wait/synch/mutex/sql/LOG_INFO::lock
+wait/synch/mutex/sql/Master_info::data_lock
+wait/synch/mutex/sql/Master_info::run_lock
+wait/synch/mutex/sql/MDL_map::mutex
+wait/synch/mutex/sql/MDL_wait::LOCK_wait_status
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index
+wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index
+wait/synch/mutex/sql/Query_cache::structure_guard_mutex
+wait/synch/mutex/sql/Relay_log_info::data_lock
+wait/synch/mutex/sql/Relay_log_info::log_space_lock
+wait/synch/mutex/sql/Relay_log_info::run_lock
+wait/synch/mutex/sql/Slave_reporting_capability::err_lock
+wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data
+wait/synch/mutex/sql/THD::LOCK_thd_data
+wait/synch/mutex/sql/tz_LOCK
+select name from rwlock_instances group by name;
+name
+wait/synch/rwlock/aria/TRANSLOG_DESCRIPTOR::open_files_lock
+wait/synch/rwlock/myisam/MYISAM_SHARE::key_root_lock
+wait/synch/rwlock/myisam/MYISAM_SHARE::mmap_lock
+wait/synch/rwlock/mysys/SAFE_HASH::mutex
+wait/synch/rwlock/sql/LOCK_dboptions
+wait/synch/rwlock/sql/LOCK_grant
+wait/synch/rwlock/sql/LOCK_system_variables_hash
+wait/synch/rwlock/sql/LOCK_sys_init_connect
+wait/synch/rwlock/sql/LOCK_sys_init_slave
+wait/synch/rwlock/sql/LOGGER::LOCK_logger
+wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for
+wait/synch/rwlock/sql/MDL_lock::rwlock
+wait/synch/rwlock/sql/THR_LOCK_servers
+wait/synch/rwlock/sql/THR_LOCK_udf
+select name from cond_instances group by name;
+name
+wait/synch/cond/aria/SERVICE_THREAD_CONTROL::COND_control
+wait/synch/cond/aria/TRANSLOG_BUFFER::prev_sent_to_disk_cond
+wait/synch/cond/aria/TRANSLOG_BUFFER::waiting_filling_buffer
+wait/synch/cond/aria/TRANSLOG_DESCRIPTOR::log_flush_cond
+wait/synch/cond/aria/TRANSLOG_DESCRIPTOR::new_goal_cond
+wait/synch/cond/mysys/COND_alarm
+wait/synch/cond/mysys/my_thread_var::suspend
+wait/synch/cond/mysys/THR_COND_threads
+wait/synch/cond/sql/COND_flush_thread_cache
+wait/synch/cond/sql/COND_manager
+wait/synch/cond/sql/COND_queue_state
+wait/synch/cond/sql/COND_rpl_status
+wait/synch/cond/sql/COND_server_started
+wait/synch/cond/sql/COND_thread_cache
+wait/synch/cond/sql/COND_thread_count
+wait/synch/cond/sql/DEBUG_SYNC::cond
+wait/synch/cond/sql/Event_scheduler::COND_state
+wait/synch/cond/sql/Master_info::data_cond
+wait/synch/cond/sql/Master_info::start_cond
+wait/synch/cond/sql/Master_info::stop_cond
+wait/synch/cond/sql/MDL_context::COND_wait_status
+wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond
+wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond
+wait/synch/cond/sql/Query_cache::COND_cache_status_changed
+wait/synch/cond/sql/Relay_log_info::data_cond
+wait/synch/cond/sql/Relay_log_info::log_space_cond
+wait/synch/cond/sql/Relay_log_info::start_cond
+wait/synch/cond/sql/Relay_log_info::stop_cond
+select event_name from file_instances group by event_name;
+event_name
+wait/io/file/aria/control
+wait/io/file/aria/translog
+wait/io/file/myisam/dfile
+wait/io/file/myisam/kfile
+wait/io/file/mysys/charset
+wait/io/file/sql/casetest
+wait/io/file/sql/dbopt
+wait/io/file/sql/ERRMSG
+wait/io/file/sql/FRM
+wait/io/file/sql/pid
+wait/io/file/sql/query_log
+wait/io/file/sql/slow_log
+select name from threads group by name;
+name
+thread/aria/checkpoint_background
+thread/sql/main
+thread/sql/one_connection
+thread/sql/signal_handler
diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result
index c7ac3d499b4..c49cb7b718e 100644
--- a/mysql-test/suite/perfschema/r/query_cache.result
+++ b/mysql-test/suite/perfschema/r/query_cache.result
@@ -38,7 +38,7 @@ spins
 NULL
 select name from performance_schema.setup_instruments order by name limit 1;
 name
-wait/io/file/csv/data
+wait/io/file/aria/control
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
@@ -53,7 +53,7 @@ spins
 NULL
 select name from performance_schema.setup_instruments order by name limit 1;
 name
-wait/io/file/csv/data
+wait/io/file/aria/control
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
diff --git a/mysql-test/suite/perfschema/t/all_instances-master.opt b/mysql-test/suite/perfschema/t/all_instances-master.opt
new file mode 100644
index 00000000000..cef79bc8585
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/all_instances-master.opt
@@ -0,0 +1 @@
+--force-restart
diff --git a/mysql-test/suite/perfschema/t/all_instances.test b/mysql-test/suite/perfschema/t/all_instances.test
new file mode 100644
index 00000000000..8f4bd6a1b76
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/all_instances.test
@@ -0,0 +1,20 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/have_maria.inc
+
+use performance_schema;
+
+#
+# list all instances of everything.
+#
+
+#
+# "group by" sorts and removes duplicates.
+# "where" filters out instances that can be conditionally compiled out
+#
+
+select name from mutex_instances group by name;
+select name from rwlock_instances group by name;
+select name from cond_instances group by name;
+select event_name from file_instances group by event_name;
+select name from threads group by name;