WL#13439 Sys Schema, Replace Stored Functions With Native Functions

WL#7803 "Performance Schema, Native Functions" defines four native functions:
format_pico_time(), format_bytes(), PS_current_thread_id(), PS_thread_id()

Now that WL#12673 "Move the Sys Schema sources into the mysql server tree"
is complete, these native functions can replace the corresponding stored
procedures in the SYS schema.

Reviewed-by: Marc Alff <marc.alff@oracle.com>

Author: Christopher Powers

mysql-test/r/initialize.result

@@ -32,7 +32,7 @@ COUNT(*)
 # If this value differs, also update SYS_FUNCTION_COUNT within ./client/upgrade/program.cc
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = 'sys' AND ROUTINE_TYPE = 'FUNCTION';
 COUNT(*)
-22
+19
 # If this value differs, also update SYS_TABLE_COUNT within ./client/upgrade/program.cc
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'sys' AND TABLE_TYPE = 'BASE TABLE';
 COUNT(*)

mysql-test/r/join_nested.result

@@ -2493,6 +2493,6 @@ INNER JOIN t AS b ON a.c >= b.d;
 c
 SELECT * FROM performance_schema.memory_summary_by_thread_by_event_name
 WHERE event_name = 'memory/sql/thd::main_mem_root'
-AND thread_id = sys.ps_thread_id(connection_id())
+AND thread_id = ps_thread_id(connection_id())
 AND sum_number_of_bytes_alloc > 1000000
 DROP TABLE t;

mysql-test/r/join_nested_bka.result

@@ -2494,7 +2494,7 @@ INNER JOIN t AS b ON a.c >= b.d;
 c
 SELECT * FROM performance_schema.memory_summary_by_thread_by_event_name
 WHERE event_name = 'memory/sql/thd::main_mem_root'
-AND thread_id = sys.ps_thread_id(connection_id())
+AND thread_id = ps_thread_id(connection_id())
 AND sum_number_of_bytes_alloc > 1000000
 DROP TABLE t;
 CREATE TABLE t5 (a int, b int, c int, PRIMARY KEY(a), KEY b_i (b));

mysql-test/r/join_nested_bka_nobnl.result

@@ -2494,7 +2494,7 @@ INNER JOIN t AS b ON a.c >= b.d;
 c
 SELECT * FROM performance_schema.memory_summary_by_thread_by_event_name
 WHERE event_name = 'memory/sql/thd::main_mem_root'
-AND thread_id = sys.ps_thread_id(connection_id())
+AND thread_id = ps_thread_id(connection_id())
 AND sum_number_of_bytes_alloc > 1000000
 DROP TABLE t;
 CREATE TABLE t5 (a int, b int, c int, PRIMARY KEY(a), KEY b_i (b));

mysql-test/r/mysqldump.result

@@ -5162,7 +5162,7 @@ DROP DATABASE dump_generated;
 #
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
-48
+45
 DROP DATABASE sys;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
@@ -5172,7 +5172,7 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
-48
+45
 #
 # WL#8697: Invisible Indexes
 # Test of mysqldump.

mysql-test/r/ps_sys_upgrade.result

@@ -48,18 +48,13 @@ ps_trace_thread
 ps_truncate_all_tables
 statement_performance_analyzer
 table_exists
-# Now drop functions and make sure re-install is done
-DROP FUNCTION sys.format_bytes;
-DROP FUNCTION sys.format_time;
 # restart:--upgrade=FORCE
 SELECT ROUTINE_NAME FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = 'sys' AND ROUTINE_TYPE = 'FUNCTION';
 ROUTINE_NAME
 extract_schema_from_file_name
 extract_table_from_file_name
-format_bytes
 format_path
 format_statement
-format_time
 list_add
 list_drop
 ps_is_account_enabled
@@ -68,7 +63,6 @@ ps_is_instrument_default_enabled
 ps_is_instrument_default_timed
 ps_is_thread_instrumented
 ps_thread_account
-ps_thread_id
 ps_thread_stack
 ps_thread_trx_info
 quote_identifier

mysql-test/suite/clone/r/monitor_progress.result

@@ -135,12 +135,10 @@ stage/innodb/clone (redo copy)	1	1	1	1
 SELECT EVENT_NAME, TIMER_START > 0, TIMER_END > 0, TIMER_WAIT > 0,
 SQL_TEXT, CURRENT_SCHEMA
 FROM performance_schema.events_statements_history_long
-WHERE thread_id = sys.ps_thread_id(CONNECTION_ID())
+WHERE thread_id = ps_thread_id(CONNECTION_ID())
 AND event_name LIKE "statement/clone/%";
 EVENT_NAME	TIMER_START > 0	TIMER_END > 0	TIMER_WAIT > 0	SQL_TEXT	CURRENT_SCHEMA
 statement/clone/local	1	1	1	CLONE LOCAL DATA DIRECTORY = '$CLONE_DATADIR'	test
-Warnings:
-Note	1585	This function 'ps_thread_id' has the same name as a native function
 SET DEBUG_SYNC='RESET';
 TRUNCATE TABLE performance_schema.events_stages_history;
 TRUNCATE TABLE performance_schema.events_stages_history_long;

mysql-test/suite/clone/r/remote_monitor_progress.result

@@ -145,12 +145,10 @@ stage/innodb/clone (redo copy)	1	1	1	1
 SELECT EVENT_NAME, TIMER_START > 0, TIMER_END > 0, TIMER_WAIT > 0,
 SQL_TEXT, CURRENT_SCHEMA
 FROM performance_schema.events_statements_history_long
-WHERE thread_id = sys.ps_thread_id(CONNECTION_ID())
+WHERE thread_id = ps_thread_id(CONNECTION_ID())
 AND event_name LIKE "statement/clone/%";
 EVENT_NAME	TIMER_START > 0	TIMER_END > 0	TIMER_WAIT > 0	SQL_TEXT	CURRENT_SCHEMA
 statement/clone/client	1	1	1	CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY <secret> DATA DIRECTORY = '$CLONE_DATADIR'	test
-Warnings:
-Note	1585	This function 'ps_thread_id' has the same name as a native function
 SET DEBUG_SYNC='RESET';
 TRUNCATE TABLE performance_schema.events_stages_history;
 TRUNCATE TABLE performance_schema.events_stages_history_long;

mysql-test/suite/clone/t/monitor_progress.test

@@ -146,7 +146,7 @@ ORDER BY EVENT_NAME;
 SELECT EVENT_NAME, TIMER_START > 0, TIMER_END > 0, TIMER_WAIT > 0,
 SQL_TEXT, CURRENT_SCHEMA
 FROM performance_schema.events_statements_history_long
-WHERE thread_id = sys.ps_thread_id(CONNECTION_ID())
+WHERE thread_id = ps_thread_id(CONNECTION_ID())
 AND event_name LIKE "statement/clone/%";
 
 SET DEBUG_SYNC='RESET';

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

@@ -106,10 +106,8 @@ SELECT ROUTINE_NAME, ROUTINE_TYPE FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE
 ROUTINE_NAME	ROUTINE_TYPE
 extract_schema_from_file_name	FUNCTION
 extract_table_from_file_name	FUNCTION
-format_bytes	FUNCTION
 format_path	FUNCTION
 format_statement	FUNCTION
-format_time	FUNCTION
 list_add	FUNCTION
 list_drop	FUNCTION
 ps_is_account_enabled	FUNCTION
@@ -118,7 +116,6 @@ 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
 quote_identifier	FUNCTION