Misc test clean up

Author: MarkLeith

mysql-test/suite/sysschema/include/sys_config_cleanup.inc

@@ -1,6 +1,6 @@
 # Reset the sys.sys_config table
 
-# Note, we have to disable the triggers  to reset the set_by column back to NULL
+# Note, we have to disable the triggers to reset the set_by column back to NULL
 # as the sys.sys_config_update_set_user trigger will overwrite it to the current user
 SET @sys.ignore_sys_config_triggers := true;
 

mysql-test/suite/sysschema/r/all_sys_objects_exist.result

@@ -30,6 +30,7 @@ schema_index_statistics
 schema_object_overview
 schema_redundant_indexes
 schema_tables_with_full_table_scans
+schema_table_lock_waits
 schema_table_statistics
 schema_table_statistics_with_buffer
 schema_unused_indexes
@@ -81,6 +82,7 @@ x$ps_schema_table_statistics_io
 x$schema_flattened_keys
 x$schema_index_statistics
 x$schema_tables_with_full_table_scans
+x$schema_table_lock_waits
 x$schema_table_statistics
 x$schema_table_statistics_with_buffer
 x$session
@@ -116,8 +118,10 @@ ps_is_consumer_enabled	FUNCTION
 ps_is_instrument_default_enabled	FUNCTION
 ps_is_instrument_default_timed	FUNCTION
 ps_is_thread_instrumented	FUNCTION
+ps_thread_account	FUNCTION
 ps_thread_id	FUNCTION
 ps_thread_stack	FUNCTION
+ps_thread_trx_info	FUNCTION
 sys_get_config	FUNCTION
 create_synonym_db	PROCEDURE
 diagnostics	PROCEDURE

mysql-test/suite/sysschema/r/fn_ps_is_instrument_default_enabled.result

@@ -1,5 +1,5 @@
-SELECT sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog');
-sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog')
+SELECT sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers');
+sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers')
 YES
 SELECT sys.ps_is_instrument_default_enabled('statement/sql/select');
 sys.ps_is_instrument_default_enabled('statement/sql/select')
@@ -10,6 +10,9 @@ YES
 SELECT sys.ps_is_instrument_default_enabled('statement/com/Prepare');
 sys.ps_is_instrument_default_enabled('statement/com/Prepare')
 YES
+SELECT sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog');
+sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog')
+YES
 SELECT sys.ps_is_instrument_default_enabled('wait/io/table/sql/handler');
 sys.ps_is_instrument_default_enabled('wait/io/table/sql/handler')
 YES
@@ -40,9 +43,6 @@ NO
 SELECT sys.ps_is_instrument_default_enabled('wait/io/socket/sql/server_tcpip_socket');
 sys.ps_is_instrument_default_enabled('wait/io/socket/sql/server_tcpip_socket')
 NO
-SELECT sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers');
-sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers')
-NO
 SELECT sys.ps_is_instrument_default_enabled('wait/lock/metadata/sql/mdl');
 sys.ps_is_instrument_default_enabled('wait/lock/metadata/sql/mdl')
 NO

mysql-test/suite/sysschema/t/fn_ps_is_instrument_default_enabled.test

@@ -3,10 +3,11 @@
 # Verify the sys.ps_is_instrument_default_enabled() function perfoms as expected
 
 # Should all be enabled
-SELECT sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog');
+SELECT sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers');
 SELECT sys.ps_is_instrument_default_enabled('statement/sql/select');
 SELECT sys.ps_is_instrument_default_enabled('statement/sp/error');
 SELECT sys.ps_is_instrument_default_enabled('statement/com/Prepare');
+SELECT sys.ps_is_instrument_default_enabled('wait/io/file/sql/binlog');
 SELECT sys.ps_is_instrument_default_enabled('wait/io/table/sql/handler');
 SELECT sys.ps_is_instrument_default_enabled('wait/lock/table/sql/handler');
 SELECT sys.ps_is_instrument_default_enabled('idle');
@@ -19,5 +20,4 @@ SELECT sys.ps_is_instrument_default_enabled('wait/synch/cond/sql/MYSQL_BIN_LOG::
 SELECT sys.ps_is_instrument_default_enabled('stage/sql/end');
 SELECT sys.ps_is_instrument_default_enabled('transaction');
 SELECT sys.ps_is_instrument_default_enabled('wait/io/socket/sql/server_tcpip_socket');
-SELECT sys.ps_is_instrument_default_enabled('memory/performance_schema/internal_buffers');
 SELECT sys.ps_is_instrument_default_enabled('wait/lock/metadata/sql/mdl');