diff --git a/include/mysql/components/services/bits/psi_thread_bits.h b/include/mysql/components/services/bits/psi_thread_bits.h
index 57f50d890cab..21e22e44c120 100644
--- a/include/mysql/components/services/bits/psi_thread_bits.h
+++ b/include/mysql/components/services/bits/psi_thread_bits.h
@@ -636,6 +636,40 @@ typedef int (*get_thread_held_locks_v1_t)(PSI_thread *thread,
                                           const char **held_lock_names,
                                           int max_count);
 
+/**
+  Record start of delay before first quantum.
+
+  @param thread the thread instrumentation
+  @param delay_start Delay start timestamp in ns.
+*/
+typedef void (*thread_start_delay_v1_t)(PSI_thread *thread,
+                                        int64_t delay_start);
+
+/**
+  Record start of quantum and end of delay between quantums.
+
+  @param thread the thread instrumentation
+  @param quantum_start Delay start timestamp in ns.
+*/
+typedef void (*thread_start_quantum_v1_t)(PSI_thread *thread,
+                                          int64_t quantum_start);
+
+/**
+  Record end of quantum and start of delay between quantums.
+
+  @param thread the thread instrumentation
+  @param quantum_end Delay start timestamp in ns.
+*/
+typedef void (*thread_end_quantum_v1_t)(PSI_thread *thread,
+                                        int64_t quantum_end);
+
+/**
+  Reset CPU stats at the end of query.
+
+  @param thread the thread instrumentation
+*/
+typedef void (*thread_reset_cpu_stats_v1_t)(PSI_thread *thread);
+
 typedef struct PSI_thread_info_v5 PSI_thread_info;
 
 typedef void (*thread_detect_telemetry_v7_t)(PSI_thread *thread);
diff --git a/include/mysql/components/services/psi_thread_service.h b/include/mysql/components/services/psi_thread_service.h
index 52f58bcd5e7c..a64d05170c55 100644
--- a/include/mysql/components/services/psi_thread_service.h
+++ b/include/mysql/components/services/psi_thread_service.h
@@ -225,6 +225,8 @@ END_SERVICE_DEFINITION(psi_thread_v5)
   Status: deprecated, use version 7 instead.
   Changes compared to version 5:
   - added set_thread_secondary_engine
+  - added thread_start_delay, thread_start_quantum, thread_end_quantum,
+          thread_reset_cpu_stats
 */
 
 BEGIN_SERVICE_DEFINITION(psi_thread_v6)
@@ -302,6 +304,16 @@ notify_session_connect_v1_t notify_session_connect;
 notify_session_disconnect_v1_t notify_session_disconnect;
 /** @sa notify_session_change_user_v1_t. */
 notify_session_change_user_v1_t notify_session_change_user;
+/** @sa get_thread_held_locks_v1_t. */
+get_thread_held_locks_v1_t get_thread_held_locks;
+/** @sa thread_start_delay_v1_t. */
+thread_start_delay_v1_t thread_start_delay;
+/** @sa thread_start_quantum_v1_t. */
+thread_start_quantum_v1_t thread_start_quantum;
+/** @sa thread_end_quantum_v1_t. */
+thread_end_quantum_v1_t thread_end_quantum;
+/** @sa thread_reset_cpu_stats_v1_t. */
+thread_reset_cpu_stats_v1_t thread_reset_cpu_stats;
 END_SERVICE_DEFINITION(psi_thread_v6)
 
 /*
diff --git a/include/mysql/psi/psi_abi_thread_v1.h.pp b/include/mysql/psi/psi_abi_thread_v1.h.pp
index 275dad28a4c4..57f08871aee3 100644
--- a/include/mysql/psi/psi_abi_thread_v1.h.pp
+++ b/include/mysql/psi/psi_abi_thread_v1.h.pp
@@ -171,6 +171,13 @@
 typedef int (*get_thread_held_locks_v1_t)(PSI_thread *thread,
                                           const char **held_lock_names,
                                           int max_count);
+typedef void (*thread_start_delay_v1_t)(PSI_thread *thread,
+                                        int64_t delay_start);
+typedef void (*thread_start_quantum_v1_t)(PSI_thread *thread,
+                                          int64_t quantum_start);
+typedef void (*thread_end_quantum_v1_t)(PSI_thread *thread,
+                                        int64_t quantum_end);
+typedef void (*thread_reset_cpu_stats_v1_t)(PSI_thread *thread);
 typedef struct PSI_thread_info_v5 PSI_thread_info;
 typedef void (*thread_detect_telemetry_v7_t)(PSI_thread *thread);
 typedef void (*thread_abort_telemetry_v7_t)(PSI_thread *thread);
@@ -303,6 +310,10 @@
   notify_session_change_user_v1_t notify_session_change_user;
   set_mem_cnt_THD_v1_t set_mem_cnt_THD;
   get_thread_held_locks_v1_t get_thread_held_locks;
+  thread_start_delay_v1_t thread_start_delay;
+  thread_start_quantum_v1_t thread_start_quantum;
+  thread_end_quantum_v1_t thread_end_quantum;
+  thread_reset_cpu_stats_v1_t thread_reset_cpu_stats;
 };
 struct PSI_thread_service_v7 {
   register_thread_v5_t register_thread;
@@ -348,6 +359,10 @@
   thread_detect_telemetry_v7_t detect_telemetry;
   thread_abort_telemetry_v7_t abort_telemetry;
   get_thread_held_locks_v1_t get_thread_held_locks;
+  thread_start_delay_v1_t thread_start_delay;
+  thread_start_quantum_v1_t thread_start_quantum;
+  thread_end_quantum_v1_t thread_end_quantum;
+  thread_reset_cpu_stats_v1_t thread_reset_cpu_stats;
 };
 typedef struct PSI_thread_service_v7 PSI_thread_service_t;
 extern PSI_thread_service_t *psi_thread_service;
diff --git a/include/mysql/psi/psi_thread.h b/include/mysql/psi/psi_thread.h
index 185ca1411f84..cc573374a578 100644
--- a/include/mysql/psi/psi_thread.h
+++ b/include/mysql/psi/psi_thread.h
@@ -304,6 +304,8 @@ struct PSI_thread_service_v5 {
   @since PSI_THREAD_VERSION_6
   Changes from version 5:
   - added set_thread_secondary_engine
+  - added thread_start_delay, thread_start_quantum, thread_end_quantum,
+          thread_reset_cpu_stats
 */
 struct PSI_thread_service_v6 {
   /** @sa register_thread_v5_t. */
@@ -388,6 +390,14 @@ struct PSI_thread_service_v6 {
   set_mem_cnt_THD_v1_t set_mem_cnt_THD;
   /** @sa  get_thread_held_locks_v1_t. */
   get_thread_held_locks_v1_t get_thread_held_locks;
+  /** @sa thread_start_delay_v1_t. */
+  thread_start_delay_v1_t thread_start_delay;
+  /** @sa thread_start_quantum_v1_t. */
+  thread_start_quantum_v1_t thread_start_quantum;
+  /** @sa thread_end_quantum_v1_t. */
+  thread_end_quantum_v1_t thread_end_quantum;
+  /** @sa thread_reset_cpu_stats_v1_t. */
+  thread_reset_cpu_stats_v1_t thread_reset_cpu_stats;
 };
 
 /**
@@ -480,8 +490,17 @@ struct PSI_thread_service_v7 {
 
   thread_detect_telemetry_v7_t detect_telemetry;
   thread_abort_telemetry_v7_t abort_telemetry;
+
   /** @sa  get_thread_held_locks_v1_t. */
   get_thread_held_locks_v1_t get_thread_held_locks;
+  /** @sa thread_start_delay_v1_t. */
+  thread_start_delay_v1_t thread_start_delay;
+  /** @sa thread_start_quantum_v1_t. */
+  thread_start_quantum_v1_t thread_start_quantum;
+  /** @sa thread_end_quantum_v1_t. */
+  thread_end_quantum_v1_t thread_end_quantum;
+  /** @sa thread_reset_cpu_stats_v1_t. */
+  thread_reset_cpu_stats_v1_t thread_reset_cpu_stats;
 };
 
 typedef struct PSI_thread_service_v7 PSI_thread_service_t;
diff --git a/include/pfs_thread_provider.h b/include/pfs_thread_provider.h
index 93774be31ac9..db36d7e4fc91 100644
--- a/include/pfs_thread_provider.h
+++ b/include/pfs_thread_provider.h
@@ -164,6 +164,14 @@ void pfs_abort_telemetry_vc(PSI_thread *thread);
 int pfs_get_thread_held_locks_vc(PSI_thread *thread,
                                  const char **held_lock_names, int max_count);
 
+void pfs_thread_start_delay_vc(PSI_thread *thread, int64_t delay_start);
+
+void pfs_thread_start_quantum_vc(PSI_thread *thread, int64_t quantum_start);
+
+void pfs_thread_end_quantum_vc(PSI_thread *thread, int64_t quantum_end);
+
+void pfs_thread_reset_cpu_stats_vc(PSI_thread *thread);
+
 #endif /* WITH_LOCK_ORDER */
 #endif /* MYSQL_DYNAMIC_PLUGIN */
 #endif /* MYSQL_SERVER || PFS_DIRECT_CALL */
diff --git a/mysql-test/r/dd_upgrade_test.result b/mysql-test/r/dd_upgrade_test.result
index 7f13bdf083d5..085ac14bca8f 100644
--- a/mysql-test/r/dd_upgrade_test.result
+++ b/mysql-test/r/dd_upgrade_test.result
@@ -467,6 +467,8 @@ threads	CREATE TABLE `threads` (
   `MAX_TOTAL_MEMORY` bigint unsigned NOT NULL,
   `TELEMETRY_ACTIVE` enum('YES','NO') NOT NULL,
   `THREAD_PRIORITY` int DEFAULT NULL,
+  `CPU_USAGE` time(6) DEFAULT NULL,
+  `DELAY_TOTAL` time(6) DEFAULT NULL,
   PRIMARY KEY (`THREAD_ID`),
   KEY `PROCESSLIST_ID` (`PROCESSLIST_ID`),
   KEY `THREAD_OS_ID` (`THREAD_OS_ID`),
diff --git a/mysql-test/suite/perfschema/include/processlist_load.inc b/mysql-test/suite/perfschema/include/processlist_load.inc
index 35d09b07a3e3..84be476009e4 100644
--- a/mysql-test/suite/perfschema/include/processlist_load.inc
+++ b/mysql-test/suite/perfschema/include/processlist_load.inc
@@ -26,7 +26,7 @@ SHOW FULL PROCESSLIST;
 --echo
 --echo # Performance Schema processlist table
 --echo
---replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State> 10 <Cpu_usage> 11 <Delay_total>
 --replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
 select * from performance_schema.processlist order by user, id;
 
@@ -36,4 +36,3 @@ select * from performance_schema.processlist order by user, id;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 --replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
 select * from information_schema.processlist order by user, id;
-
diff --git a/mysql-test/suite/perfschema/r/dd_version_check.result b/mysql-test/suite/perfschema/r/dd_version_check.result
index 5322d734d578..5bc738d1a31c 100644
--- a/mysql-test/suite/perfschema/r/dd_version_check.result
+++ b/mysql-test/suite/perfschema/r/dd_version_check.result
@@ -1,4 +1,4 @@
 "Checking the data dictionary properties ..."
 SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1)
-PS_VERSION=80036024
+PS_VERSION=80036025
 "Checking the performance schema database structure ..."
diff --git a/mysql-test/suite/perfschema/r/idx_threads.result b/mysql-test/suite/perfschema/r/idx_threads.result
index d23431cafa1d..d7bc2e4a114d 100644
--- a/mysql-test/suite/perfschema/r/idx_threads.result
+++ b/mysql-test/suite/perfschema/r/idx_threads.result
@@ -20,14 +20,14 @@ where thread_id > 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PRIMARY	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_ID` > 1)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_ID` > 1)
 
 explain select * from performance_schema.threads
 where thread_id < 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PRIMARY	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_ID` < 1)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_ID` < 1)
 
 select processlist_id = @conid, name, processlist_info
 from performance_schema.threads
@@ -45,14 +45,14 @@ where processlist_id > 99999;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_ID	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_ID` > 99999)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_ID` > 99999)
 
 explain select * from performance_schema.threads
 where processlist_id < 99999;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_ID	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_ID` < 99999)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_ID` < 99999)
 
 select thread_id = @tid, name, processlist_info
 from performance_schema.threads
@@ -70,14 +70,14 @@ where thread_os_id > 99999;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	THREAD_OS_ID	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_OS_ID` > 99999)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_OS_ID` > 99999)
 
 explain select * from performance_schema.threads
 where thread_os_id < 99999;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	THREAD_OS_ID	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_OS_ID` < 99999)
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`THREAD_OS_ID` < 99999)
 
 select thread_id - @tid, name, processlist_info
 from performance_schema.threads
@@ -104,21 +104,21 @@ where NAME > "foo";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	NAME	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` > 'foo')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` > 'foo')
 
 explain select * from performance_schema.threads
 where NAME < "bar";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	NAME	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` < 'bar')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` < 'bar')
 
 explain select * from performance_schema.threads
 where NAME like "thread/sql/%";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	NAME	NULL	NULL	NULL	256	11.11	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` like 'thread/sql/%')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`NAME` like 'thread/sql/%')
 
 select thread_id, name, processlist_state, processlist_info
 from performance_schema.threads
@@ -145,21 +145,21 @@ where PROCESSLIST_USER > "foo";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_ACCOUNT	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` > 'foo')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` > 'foo')
 
 explain select * from performance_schema.threads
 where PROCESSLIST_USER < "bar";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_ACCOUNT	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` < 'bar')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` < 'bar')
 
 explain select * from performance_schema.threads
 where PROCESSLIST_USER like "ro%";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_ACCOUNT	NULL	NULL	NULL	256	11.11	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` like 'ro%')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_USER` like 'ro%')
 
 select thread_id, thread_id = @tid, name, processlist_state, processlist_info
 from performance_schema.threads
@@ -186,21 +186,21 @@ where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST < "foo";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ref	PROCESSLIST_ACCOUNT,PROCESSLIST_HOST	PROCESSLIST_ACCOUNT	323	const	10	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` < 'foo'))
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` < 'foo'))
 
 explain select * from performance_schema.threads
 where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST > "bar";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ref	PROCESSLIST_ACCOUNT,PROCESSLIST_HOST	PROCESSLIST_ACCOUNT	323	const	10	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` > 'bar'))
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` > 'bar'))
 
 explain select * from performance_schema.threads
 where PROCESSLIST_USER = "foo" and PROCESSLIST_HOST like "bar%";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ref	PROCESSLIST_ACCOUNT,PROCESSLIST_HOST	PROCESSLIST_ACCOUNT	323	const	10	11.11	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'bar%'))
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where ((`performance_schema`.`threads`.`PROCESSLIST_USER` = 'foo') and (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'bar%'))
 
 select thread_id, thread_id = @tid, name, processlist_state, processlist_info
 from performance_schema.threads
@@ -227,21 +227,21 @@ where PROCESSLIST_HOST > "foo";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_HOST	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` > 'foo')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` > 'foo')
 
 explain select * from performance_schema.threads
 where PROCESSLIST_HOST < "bar";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_HOST	NULL	NULL	NULL	256	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` < 'bar')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` < 'bar')
 
 explain select * from performance_schema.threads
 where PROCESSLIST_HOST like "local%";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	PROCESSLIST_HOST	NULL	NULL	NULL	256	11.11	Using where
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'local%')
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads` where (`performance_schema`.`threads`.`PROCESSLIST_HOST` like 'local%')
 
 select thread_id, thread_id = @tid, name, processlist_state, processlist_info
 from performance_schema.threads
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index ae4f0c16b319..5e0fb9ace1bf 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -141,7 +141,7 @@ explain select * from performance_schema.threads;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
 Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY` from `performance_schema`.`threads`
+Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID`,`performance_schema`.`threads`.`RESOURCE_GROUP` AS `RESOURCE_GROUP`,`performance_schema`.`threads`.`EXECUTION_ENGINE` AS `EXECUTION_ENGINE`,`performance_schema`.`threads`.`CONTROLLED_MEMORY` AS `CONTROLLED_MEMORY`,`performance_schema`.`threads`.`MAX_CONTROLLED_MEMORY` AS `MAX_CONTROLLED_MEMORY`,`performance_schema`.`threads`.`TOTAL_MEMORY` AS `TOTAL_MEMORY`,`performance_schema`.`threads`.`MAX_TOTAL_MEMORY` AS `MAX_TOTAL_MEMORY`,`performance_schema`.`threads`.`TELEMETRY_ACTIVE` AS `TELEMETRY_ACTIVE`,`performance_schema`.`threads`.`THREAD_PRIORITY` AS `THREAD_PRIORITY`,`performance_schema`.`threads`.`CPU_USAGE` AS `CPU_USAGE`,`performance_schema`.`threads`.`DELAY_TOTAL` AS `DELAY_TOTAL` from `performance_schema`.`threads`
 use performance_schema;
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
diff --git a/mysql-test/suite/perfschema/r/processlist.result b/mysql-test/suite/perfschema/r/processlist.result
index 0b62fab955b1..30eddd07712f 100644
--- a/mysql-test/suite/perfschema/r/processlist.result
+++ b/mysql-test/suite/perfschema/r/processlist.result
@@ -72,14 +72,14 @@ Id	User	Host	db	Command	Time	State	Info
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY
-<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999	PRIMARY
-<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3	PRIMARY
-<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
@@ -117,14 +117,14 @@ Warnings:
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY
-<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999	PRIMARY
-<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3	PRIMARY
-<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
diff --git a/mysql-test/suite/perfschema/r/processlist_acl.result b/mysql-test/suite/perfschema/r/processlist_acl.result
index c2f76851c9f3..29a9b6eb1d02 100644
--- a/mysql-test/suite/perfschema/r/processlist_acl.result
+++ b/mysql-test/suite/perfschema/r/processlist_acl.result
@@ -90,17 +90,17 @@ Id	User	Host	db	Command	Time	State	Info
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
@@ -142,17 +142,17 @@ Warnings:
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
@@ -192,11 +192,11 @@ Id	User	Host	db	Command	Time	State	Info
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
@@ -235,11 +235,11 @@ Warnings:
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
diff --git a/mysql-test/suite/perfschema/r/processlist_anonymous.result b/mysql-test/suite/perfschema/r/processlist_anonymous.result
index 91ec2a0db353..1bccc6dcf332 100644
--- a/mysql-test/suite/perfschema/r/processlist_anonymous.result
+++ b/mysql-test/suite/perfschema/r/processlist_anonymous.result
@@ -14,7 +14,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 Warnings:
 Warning	1287	'INFORMATION_SCHEMA.PROCESSLIST' is deprecated and will be removed in a future release. Please use performance_schema.processlist instead
 SELECT * FROM performance_schema.processlist;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
 SHOW PROCESSLIST;
 ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
 SET @@global.performance_schema_show_processlist = ON;
@@ -28,7 +28,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 Warnings:
 Warning	1287	'INFORMATION_SCHEMA.PROCESSLIST' is deprecated and will be removed in a future release. Please use performance_schema.processlist instead
 SELECT * FROM performance_schema.processlist;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
 SHOW PROCESSLIST;
 ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
 GRANT PROCESS ON *.* TO ''@'localhost';
diff --git a/mysql-test/suite/perfschema/r/processlist_port.result b/mysql-test/suite/perfschema/r/processlist_port.result
index b1231f43409e..aecb89e4dc55 100644
--- a/mysql-test/suite/perfschema/r/processlist_port.result
+++ b/mysql-test/suite/perfschema/r/processlist_port.result
@@ -56,14 +56,14 @@ Id	User	Host	db	Command	Time	State	Info
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
@@ -102,14 +102,14 @@ Warnings:
 # Performance Schema processlist table
 
 select * from performance_schema.processlist order by user, id;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE
-<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY
-<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
-<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	EXECUTION_ENGINE	CPU_USAGE	DELAY_TOTAL
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL	PRIMARY	<Cpu_usage>	<Delay_total>
 
 # Information Schema processlist table
 
diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result
index b0843420de00..81889add3fd0 100644
--- a/mysql-test/suite/perfschema/r/schema.result
+++ b/mysql-test/suite/perfschema/r/schema.result
@@ -1689,6 +1689,8 @@ threads	CREATE TABLE `threads` (
   `MAX_TOTAL_MEMORY` bigint unsigned NOT NULL,
   `TELEMETRY_ACTIVE` enum('YES','NO') NOT NULL,
   `THREAD_PRIORITY` int DEFAULT NULL,
+  `CPU_USAGE` time(6) DEFAULT NULL,
+  `DELAY_TOTAL` time(6) DEFAULT NULL,
   PRIMARY KEY (`THREAD_ID`),
   KEY `PROCESSLIST_ID` (`PROCESSLIST_ID`),
   KEY `THREAD_OS_ID` (`THREAD_OS_ID`),
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result
index 92b538e33f93..1661f2ed8850 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -372,7 +372,7 @@ EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TI
 select * from performance_schema.table_handles;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	OWNER_THREAD_ID	OWNER_EVENT_ID	INTERNAL_LOCK	EXTERNAL_LOCK
 select * from performance_schema.threads;
-THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP	EXECUTION_ENGINE	CONTROLLED_MEMORY	MAX_CONTROLLED_MEMORY	TOTAL_MEMORY	MAX_TOTAL_MEMORY	TELEMETRY_ACTIVE	THREAD_PRIORITY
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP	EXECUTION_ENGINE	CONTROLLED_MEMORY	MAX_CONTROLLED_MEMORY	TOTAL_MEMORY	MAX_TOTAL_MEMORY	TELEMETRY_ACTIVE	THREAD_PRIORITY	CPU_USAGE	DELAY_TOTAL
 select * from performance_schema.users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS	MAX_SESSION_CONTROLLED_MEMORY	MAX_SESSION_TOTAL_MEMORY
 select * from performance_schema.sql_text;
diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result
index ff1e78bda4cd..375bfa3abd47 100644
--- a/mysql-test/suite/perfschema/r/table_schema.result
+++ b/mysql-test/suite/perfschema/r/table_schema.result
@@ -1233,6 +1233,8 @@ def	performance_schema	processlist	TIME	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NU
 def	performance_schema	processlist	STATE	7	NULL	YES	varchar	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(64)			select,insert,update,references			NULL	NULL
 def	performance_schema	processlist	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	longtext			select,insert,update,references			NULL	NULL
 def	performance_schema	processlist	EXECUTION_ENGINE	9	NULL	YES	enum	9	36	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('PRIMARY','SECONDARY')			select,insert,update,references			NULL	NULL
+def	performance_schema	processlist	CPU_USAGE	10	NULL	YES	time	NULL	NULL	NULL	NULL	6	NULL	NULL	time(6)			select,insert,update,references			NULL	NULL
+def	performance_schema	processlist	DELAY_TOTAL	11	NULL	YES	time	NULL	NULL	NULL	NULL	6	NULL	NULL	time(6)			select,insert,update,references			NULL	NULL
 def	performance_schema	replication_applier_configuration	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)	PRI		select,insert,update,references			NULL	NULL
 def	performance_schema	replication_applier_configuration	DESIRED_DELAY	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL	NULL
 def	performance_schema	replication_applier_configuration	PRIVILEGE_CHECKS_USER	3	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8mb3	utf8mb3_bin	text			select,insert,update,references	User name for the security context of the applier.		NULL	NULL
@@ -1687,6 +1689,8 @@ def	performance_schema	threads	TOTAL_MEMORY	22	NULL	NO	bigint	NULL	NULL	20	0	NUL
 def	performance_schema	threads	MAX_TOTAL_MEMORY	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL	NULL
 def	performance_schema	threads	TELEMETRY_ACTIVE	24	NULL	NO	enum	3	12	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('YES','NO')			select,insert,update,references			NULL	NULL
 def	performance_schema	threads	THREAD_PRIORITY	25	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL	NULL
+def	performance_schema	threads	CPU_USAGE	26	NULL	YES	time	NULL	NULL	NULL	NULL	6	NULL	NULL	time(6)			select,insert,update,references			NULL	NULL
+def	performance_schema	threads	DELAY_TOTAL	27	NULL	YES	time	NULL	NULL	NULL	NULL	6	NULL	NULL	time(6)			select,insert,update,references			NULL	NULL
 def	performance_schema	tls_channel_status	CHANNEL	1	NULL	NO	varchar	128	512	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(128)			select,insert,update,references			NULL	NULL
 def	performance_schema	tls_channel_status	PROPERTY	2	NULL	NO	varchar	128	512	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(128)			select,insert,update,references			NULL	NULL
 def	performance_schema	tls_channel_status	VALUE	3	NULL	NO	varchar	2048	8192	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(2048)			select,insert,update,references			NULL	NULL
diff --git a/mysys/psi_noop.cc b/mysys/psi_noop.cc
index 99184cd9abcc..65a2f3fb97ae 100644
--- a/mysys/psi_noop.cc
+++ b/mysys/psi_noop.cc
@@ -215,10 +215,18 @@ static void set_mem_cnt_THD_noop(THD *, THD **backup_thd) {
 static void detect_telemetry_noop(PSI_thread * /*unused*/) {}
 static void abort_telemetry_noop(PSI_thread * /*unused*/) {}
 
-static int pfs_get_thread_held_locks_noop(PSI_thread *, const char **, int) {
+static int get_thread_held_locks_noop(PSI_thread *, const char **, int) {
   return 0;
 }
 
+static void thread_start_delay_noop(PSI_thread *, int64_t) { return; }
+
+static void thread_start_quantum_noop(PSI_thread *, int64_t) { return; }
+
+static void thread_end_quantum_noop(PSI_thread *, int64_t) { return; }
+
+static void thread_reset_cpu_stats_noop(PSI_thread *) { return; }
+
 static PSI_thread_service_t psi_thread_noop = {
     register_thread_noop,
     spawn_thread_noop,
@@ -262,7 +270,11 @@ static PSI_thread_service_t psi_thread_noop = {
     set_mem_cnt_THD_noop,
     detect_telemetry_noop,
     abort_telemetry_noop,
-    pfs_get_thread_held_locks_noop};
+    get_thread_held_locks_noop,
+    thread_start_delay_noop,
+    thread_start_quantum_noop,
+    thread_end_quantum_noop,
+    thread_reset_cpu_stats_noop};
 
 struct PSI_thread_bootstrap *psi_thread_hook = nullptr;
 PSI_thread_service_t *psi_thread_service = &psi_thread_noop;
diff --git a/sql/debug_lock_order.cc b/sql/debug_lock_order.cc
index 67f967cb1a60..642ced43e243 100644
--- a/sql/debug_lock_order.cc
+++ b/sql/debug_lock_order.cc
@@ -7812,6 +7812,42 @@ static int lo_get_thread_held_locks(PSI_thread *thread,
   return lock_count;
 }
 
+static void lo_thread_start_delay(PSI_thread *thread, int64_t delay_start) {
+  LO_thread *lo = LO_thread::from_psi(thread);
+  if (lo != nullptr) {
+    if ((g_thread_chain != nullptr) && (lo->m_chain != nullptr)) {
+      g_thread_chain->thread_start_delay(lo->m_chain, delay_start);
+    }
+  }
+}
+
+static void lo_thread_start_quantum(PSI_thread *thread, int64_t quantum_start) {
+  LO_thread *lo = LO_thread::from_psi(thread);
+  if (lo != nullptr) {
+    if ((g_thread_chain != nullptr) && (lo->m_chain != nullptr)) {
+      g_thread_chain->thread_start_quantum(lo->m_chain, quantum_start);
+    }
+  }
+}
+
+void lo_thread_end_quantum(PSI_thread *thread, int64_t quantum_end) {
+  LO_thread *lo = LO_thread::from_psi(thread);
+  if (lo != nullptr) {
+    if ((g_thread_chain != nullptr) && (lo->m_chain != nullptr)) {
+      g_thread_chain->thread_end_quantum(lo->m_chain, quantum_end);
+    }
+  }
+}
+
+void lo_thread_reset_cpu_stats(PSI_thread *thread) {
+  LO_thread *lo = LO_thread::from_psi(thread);
+  if (lo != nullptr) {
+    if ((g_thread_chain != nullptr) && (lo->m_chain != nullptr)) {
+      g_thread_chain->thread_reset_cpu_stats(lo->m_chain);
+    }
+  }
+}
+
 PSI_thread_service_v7 LO_thread_v7 = {lo_register_thread,
                                       lo_spawn_thread,
                                       lo_new_thread,
@@ -7850,7 +7886,11 @@ PSI_thread_service_v7 LO_thread_v7 = {lo_register_thread,
                                       lo_set_mem_cnt_THD,
                                       lo_detect_telemetry,
                                       lo_abort_telemetry,
-                                      lo_get_thread_held_locks};
+                                      lo_get_thread_held_locks,
+                                      lo_thread_start_delay,
+                                      lo_thread_start_quantum,
+                                      lo_thread_end_quantum,
+                                      lo_thread_reset_cpu_stats};
 
 static void *lo_get_thread_interface(int version) {
   switch (version) {
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index dcfd49a4b3c9..f120a151b8dc 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -90,7 +90,7 @@
 */
 
 static_assert((PFS_DD_VERSION <= MYSQL_VERSION_ID) ||
-                  ((PFS_DD_VERSION == 80036024) && (MYSQL_VERSION_ID == 80036)),
+                  ((PFS_DD_VERSION == 80036025) && (MYSQL_VERSION_ID == 80036)),
               "This release can not use a version number from the future");
 
 class KEY;
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index 7f5cdd2e416e..a2c2d8e3daf8 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -3805,6 +3805,76 @@ int pfs_get_thread_held_locks_vc(PSI_thread *thread,
   return lock_count;
 }
 
+/**
+  Implementation of the thread instrumentation interface.
+  @sa PSI_v6::thread_start_delay.
+*/
+void pfs_thread_start_delay_vc(PSI_thread *thread, int64_t delay_start) {
+  PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
+  if (likely(pfs)) {
+    // Record delay start. This would be done only before the very first
+    // quantum.
+    pfs->m_cpu_sched_stat.m_delay_start = delay_start;
+  }
+}
+
+/**
+  Implementation of the thread instrumentation interface.
+  @sa PSI_v6::thread_start_quantum.
+*/
+void pfs_thread_start_quantum_vc(PSI_thread *thread, int64_t quantum_start) {
+  PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
+  if (likely(pfs)) {
+    auto &cpu_sched_stat = pfs->m_cpu_sched_stat;
+    if (!cpu_sched_stat.m_cpu_start) {
+      // Record delay between previous and new quantums.
+      auto delay_start = cpu_sched_stat.m_delay_start;
+      if (delay_start) {
+        cpu_sched_stat.m_delay_start = 0;
+        if (delay_start < quantum_start) {
+          cpu_sched_stat.m_delay_total_ns += quantum_start - delay_start;
+        }
+      }
+
+      // Record start of new quantum.
+      cpu_sched_stat.m_cpu_start = quantum_start;
+    }
+  }
+}
+
+/**
+  Implementation of the thread instrumentation interface.
+  @sa PSI_v6::thread_end_quantum.
+*/
+void pfs_thread_end_quantum_vc(PSI_thread *thread, int64_t quantum_end) {
+  PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
+  if (likely(pfs)) {
+    auto &cpu_sched_stat = pfs->m_cpu_sched_stat;
+    auto cpu_start = cpu_sched_stat.m_cpu_start;
+    if (cpu_start) {
+      // Record CPU usage for this quantum.
+      cpu_sched_stat.m_cpu_start = 0;
+      if (cpu_start < quantum_end) {
+        cpu_sched_stat.m_cpu_total_ns += quantum_end - cpu_start;
+      }
+
+      // Record start of delay between quantums.
+      cpu_sched_stat.m_delay_start = quantum_end;
+    }
+  }
+}
+
+/**
+  Implementation of the thread instrumentation interface.
+  @sa PSI_v6::thread_reset_cpu_stats.
+*/
+void pfs_thread_reset_cpu_stats_vc(PSI_thread *thread) {
+  PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
+  if (likely(pfs)) {
+    pfs->m_cpu_sched_stat.reset();
+  }
+}
+
 /**
   Implementation of the mutex instrumentation interface.
   @sa PSI_v1::start_mutex_wait.
@@ -9739,7 +9809,11 @@ PSI_thread_service_v6 pfs_thread_service_v6 = {
     pfs_notify_session_disconnect_vc,
     pfs_notify_session_change_user_vc,
     pfs_set_mem_cnt_THD_vc,
-    pfs_get_thread_held_locks_vc};
+    pfs_get_thread_held_locks_vc,
+    pfs_thread_start_delay_vc,
+    pfs_thread_start_quantum_vc,
+    pfs_thread_end_quantum_vc,
+    pfs_thread_reset_cpu_stats_vc};
 
 SERVICE_TYPE(psi_thread_v6)
 SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v6) = {
@@ -9780,7 +9854,12 @@ SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v6) = {
     pfs_unregister_notification_vc,
     pfs_notify_session_connect_vc,
     pfs_notify_session_disconnect_vc,
-    pfs_notify_session_change_user_vc};
+    pfs_notify_session_change_user_vc,
+    pfs_get_thread_held_locks_vc,
+    pfs_thread_start_delay_vc,
+    pfs_thread_start_quantum_vc,
+    pfs_thread_end_quantum_vc,
+    pfs_thread_reset_cpu_stats_vc};
 
 /**
   Implementation of the instrumentation interface.
@@ -9830,7 +9909,11 @@ PSI_thread_service_v7 pfs_thread_service_v7 = {
     pfs_set_mem_cnt_THD_vc,
     pfs_detect_telemetry_vc,
     pfs_abort_telemetry_vc,
-    pfs_get_thread_held_locks_vc};
+    pfs_get_thread_held_locks_vc,
+    pfs_thread_start_delay_vc,
+    pfs_thread_start_quantum_vc,
+    pfs_thread_end_quantum_vc,
+    pfs_thread_reset_cpu_stats_vc};
 
 SERVICE_TYPE(psi_thread_v7)
 SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v7) = {
diff --git a/storage/perfschema/pfs_dd_version.h b/storage/perfschema/pfs_dd_version.h
index 3df24fbc6789..9f5fedb916c5 100644
--- a/storage/perfschema/pfs_dd_version.h
+++ b/storage/perfschema/pfs_dd_version.h
@@ -335,10 +335,13 @@
   80036-024:
   - Add new table SQL_PLANS for capturing query execution PLANS
 
+  80036-025:
+  - Add CPU_USAGE and DELAY_TOTAL columns to P_S.processlist and P_S.threads.
+
   The last three digits reprents Facebook specific MySQL Schema changes.
-  Version published is now 80036-024. i.e. 8.0.36 Facebook schema change no. 24.
+  Version published is now 80036-025. i.e. 8.0.36 Facebook schema change no. 25.
 */
 
-static const uint PFS_DD_VERSION = 80036024;
+static const uint PFS_DD_VERSION = 80036025;
 
 #endif /* PFS_DD_VERSION_H */
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
index 86cf2ee412e7..5dde063a54a5 100644
--- a/storage/perfschema/pfs_instr.cc
+++ b/storage/perfschema/pfs_instr.cc
@@ -804,6 +804,7 @@ PFS_thread *create_thread(PFS_thread_class *klass, PSI_thread_seqnum seqnum,
     pfs->m_os_name[PFS_MAX_OS_NAME_LENGTH - 1] = '\0';
 
     pfs->m_session_all_memory_stat.reset();
+    pfs->m_cpu_sched_stat.reset();
 
 #ifdef HAVE_PSI_SERVER_TELEMETRY_TRACES_INTERFACE
     pfs->m_telemetry = nullptr;
diff --git a/storage/perfschema/pfs_instr.h b/storage/perfschema/pfs_instr.h
index 6514e457277a..2489af4eda8a 100644
--- a/storage/perfschema/pfs_instr.h
+++ b/storage/perfschema/pfs_instr.h
@@ -776,6 +776,8 @@ struct PFS_ALIGNED PFS_thread : PFS_connection_slice {
   void add_held_lock(void *lock);
   void remove_held_lock(void *lock);
   int get_held_locks(const char **held_lock_names, int max_count);
+
+  PFS_cpu_sched_stat m_cpu_sched_stat;
 };
 
 void carry_global_memory_stat_alloc_delta(PFS_memory_stat_alloc_delta *delta,
diff --git a/storage/perfschema/pfs_stat.cc b/storage/perfschema/pfs_stat.cc
index 131f707c80c3..8526e1494d4e 100644
--- a/storage/perfschema/pfs_stat.cc
+++ b/storage/perfschema/pfs_stat.cc
@@ -1032,4 +1032,9 @@ void memory_monitoring_aggregate(const PFS_memory_shared_stat *from,
   }
 }
 
+/**
+  Reset CPU stats.
+*/
+void PFS_cpu_sched_stat::reset() { memset(this, 0, sizeof(*this)); }
+
 /** @} */
diff --git a/storage/perfschema/pfs_stat.h b/storage/perfschema/pfs_stat.h
index 1c497faeabee..bc1f80789aa9 100644
--- a/storage/perfschema/pfs_stat.h
+++ b/storage/perfschema/pfs_stat.h
@@ -1355,5 +1355,17 @@ struct PFS_connection_stat {
   }
 };
 
+/**
+  CPU scheduler statistics.
+*/
+struct PFS_cpu_sched_stat {
+  int64_t m_cpu_total_ns{0};
+  int64_t m_cpu_start{0};
+  int64_t m_delay_total_ns{0};
+  int64_t m_delay_start{0};
+
+  void reset();
+};
+
 /** @} */
 #endif
diff --git a/storage/perfschema/table_processlist.cc b/storage/perfschema/table_processlist.cc
index 684620b594f4..2a740b76b2bc 100644
--- a/storage/perfschema/table_processlist.cc
+++ b/storage/perfschema/table_processlist.cc
@@ -66,6 +66,8 @@ Plugin_table table_processlist::m_table_def(
     "  STATE VARCHAR(64),\n"
     "  INFO LONGTEXT,\n"
     "  EXECUTION_ENGINE ENUM ('PRIMARY', 'SECONDARY'),\n"
+    "  CPU_USAGE TIME(6),\n"
+    "  DELAY_TOTAL TIME(6),\n"
     "  PRIMARY KEY (ID) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -310,6 +312,8 @@ int table_processlist::make_row(PFS_thread *pfs) {
 
   m_row.m_secondary = pfs->m_secondary;
 
+  m_row.m_cpu_sched_stat = pfs->m_cpu_sched_stat;
+
   if (!pfs->m_lock.end_optimistic_lock(&lock)) {
     return HA_ERR_RECORD_DELETED;
   }
@@ -320,10 +324,14 @@ int table_processlist::make_row(PFS_thread *pfs) {
 int table_processlist::read_row_values(TABLE *table, unsigned char *buf,
                                        Field **fields, bool read_all) {
   Field *f;
+  int64_t now_ns = 0;
+  MYSQL_TIME t;
+  t.neg = false;
 
   /* Set the null bits */
-  assert(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 2);
   buf[0] = 0;
+  buf[1] = 0;
 
   for (; (f = *fields); fields++) {
     if (read_all || bitmap_is_set(table->read_set, f->field_index())) {
@@ -393,6 +401,46 @@ int table_processlist::read_row_values(TABLE *table, unsigned char *buf,
         case 8: /* EXECUTION_ENGINE */
           set_field_enum(f, m_row.m_secondary ? ENUM_SECONDARY : ENUM_PRIMARY);
           break;
+        case 9: /* CPU_USAGE */
+          if (m_row.m_cpu_sched_stat.m_cpu_start ||
+              m_row.m_cpu_sched_stat.m_cpu_total_ns) {
+            int64_t cpu_usage_ns = m_row.m_cpu_sched_stat.m_cpu_total_ns;
+            if (m_row.m_cpu_sched_stat.m_cpu_start) {
+              if (!now_ns) {
+                now_ns = my_getsystime() * 100;
+              }
+              if (now_ns > m_row.m_cpu_sched_stat.m_cpu_start) {
+                cpu_usage_ns += now_ns - m_row.m_cpu_sched_stat.m_cpu_start;
+              }
+            }
+
+            calc_time_from_sec(&t, cpu_usage_ns / 1000000000,
+                               cpu_usage_ns / 1000 % 1000000);
+            f->store_time(&t);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 10: /* DELAY_TOTAL */
+          if (m_row.m_cpu_sched_stat.m_delay_start ||
+              m_row.m_cpu_sched_stat.m_delay_total_ns) {
+            int64_t delay_total_ns = m_row.m_cpu_sched_stat.m_delay_total_ns;
+            if (m_row.m_cpu_sched_stat.m_delay_start) {
+              if (!now_ns) {
+                now_ns = my_getsystime() * 100;
+              }
+              if (now_ns > m_row.m_cpu_sched_stat.m_delay_start) {
+                delay_total_ns += now_ns - m_row.m_cpu_sched_stat.m_delay_start;
+              }
+            }
+
+            calc_time_from_sec(&t, delay_total_ns / 1000000000,
+                               delay_total_ns / 1000 % 1000000);
+            f->store_time(&t);
+          } else {
+            f->set_null();
+          }
+          break;
         default:
           assert(false);
       }
diff --git a/storage/perfschema/table_processlist.h b/storage/perfschema/table_processlist.h
index 0def76272c99..ccea6be50382 100644
--- a/storage/perfschema/table_processlist.h
+++ b/storage/perfschema/table_processlist.h
@@ -73,6 +73,8 @@ struct row_processlist {
   uint m_processlist_info_length;
   /** Column EXECUTION_ENGINE. */
   bool m_secondary;
+  /** Data for columns CPU_USAGE and DELAY_TOTAL. */
+  PFS_cpu_sched_stat m_cpu_sched_stat;
 };
 
 class PFS_index_processlist_by_processlist_id : public PFS_index_threads {
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index 33e63c3fb825..2546777cd37c 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -75,6 +75,8 @@ Plugin_table table_threads::m_table_def(
     "  MAX_TOTAL_MEMORY BIGINT unsigned not null,\n"
     "  TELEMETRY_ACTIVE ENUM ('YES', 'NO') not null,\n"
     "  THREAD_PRIORITY INTEGER,\n"
+    "  CPU_USAGE TIME(6),\n"
+    "  DELAY_TOTAL TIME(6),\n"
     "  PRIMARY KEY (THREAD_ID) USING HASH,\n"
     "  KEY (PROCESSLIST_ID) USING HASH,\n"
     "  KEY (THREAD_OS_ID) USING HASH,\n"
@@ -336,6 +338,8 @@ int table_threads::make_row(PFS_thread *pfs) {
 
   m_row.m_telemetry_active = (pfs->m_telemetry_session != nullptr);
 
+  m_row.m_cpu_sched_stat = pfs->m_cpu_sched_stat;
+
   if (!pfs->m_lock.end_optimistic_lock(&lock)) {
     return HA_ERR_RECORD_DELETED;
   }
@@ -348,11 +352,15 @@ int table_threads::read_row_values(TABLE *table, unsigned char *buf,
   Field *f;
   const char *str = nullptr;
   int len = 0;
+  int64_t now_ns = 0;
+  MYSQL_TIME t;
+  t.neg = false;
 
   /* Set the null bits */
-  assert(table->s->null_bytes == 2);
+  assert(table->s->null_bytes == 3);
   buf[0] = 0;
   buf[1] = 0;
+  buf[2] = 0;
 
   for (; (f = *fields); fields++) {
     if (read_all || bitmap_is_set(table->read_set, f->field_index())) {
@@ -493,6 +501,46 @@ int table_threads::read_row_values(TABLE *table, unsigned char *buf,
             f->set_null();
           }
           break;
+        case 25: /* CPU_USAGE */
+          if (m_row.m_cpu_sched_stat.m_cpu_start ||
+              m_row.m_cpu_sched_stat.m_cpu_total_ns) {
+            int64_t cpu_usage_ns = m_row.m_cpu_sched_stat.m_cpu_total_ns;
+            if (m_row.m_cpu_sched_stat.m_cpu_start) {
+              if (!now_ns) {
+                now_ns = my_getsystime() * 100;
+              }
+              if (now_ns > m_row.m_cpu_sched_stat.m_cpu_start) {
+                cpu_usage_ns += now_ns - m_row.m_cpu_sched_stat.m_cpu_start;
+              }
+            }
+
+            calc_time_from_sec(&t, cpu_usage_ns / 1000000000,
+                               cpu_usage_ns / 1000 % 1000000);
+            f->store_time(&t);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 26: /* DELAY_TOTAL */
+          if (m_row.m_cpu_sched_stat.m_delay_start ||
+              m_row.m_cpu_sched_stat.m_delay_total_ns) {
+            int64_t delay_total_ns = m_row.m_cpu_sched_stat.m_delay_total_ns;
+            if (m_row.m_cpu_sched_stat.m_delay_start) {
+              if (!now_ns) {
+                now_ns = my_getsystime() * 100;
+              }
+              if (now_ns > m_row.m_cpu_sched_stat.m_delay_start) {
+                delay_total_ns += now_ns - m_row.m_cpu_sched_stat.m_delay_start;
+              }
+            }
+
+            calc_time_from_sec(&t, delay_total_ns / 1000000000,
+                               delay_total_ns / 1000 % 1000000);
+            f->store_time(&t);
+          } else {
+            f->set_null();
+          }
+          break;
         default:
           assert(false);
       }
diff --git a/storage/perfschema/table_threads.h b/storage/perfschema/table_threads.h
index d2bd19098d3a..1191b3e6f4ef 100644
--- a/storage/perfschema/table_threads.h
+++ b/storage/perfschema/table_threads.h
@@ -96,6 +96,8 @@ struct row_threads {
   bool m_telemetry_active;
   /** Column THREAD_PRIORITY. */
   int m_thread_priority;
+  /** Data for columns CPU_USAGE and DELAY_TOTAL. */
+  PFS_cpu_sched_stat m_cpu_sched_stat;
 };
 
 class PFS_index_threads_by_thread_id : public PFS_index_threads {
diff --git a/storage/perfschema/unittest/pfs-t.cc b/storage/perfschema/unittest/pfs-t.cc
index 91504648b34c..9367937f4665 100644
--- a/storage/perfschema/unittest/pfs-t.cc
+++ b/storage/perfschema/unittest/pfs-t.cc
@@ -2648,6 +2648,162 @@ static void test_terminology_use_previous() {
   }
 }
 
+/**
+  Verify thread quantum and delay APIs.
+*/
+struct Cpu_stats_test {
+  // CPU stats of PFS_thread being tested.
+  PFS_cpu_sched_stat &cpu_stat;
+
+  // Expected values of CPU stat members.
+  int64_t delay_start = 0;
+  int64_t quantum_start = 0;
+  int64_t delay_total = 0;
+  int64_t cpu_total = 0;
+
+  Cpu_stats_test(PFS_cpu_sched_stat &stat) : cpu_stat(stat) {}
+  void validate_cpu_stats() {
+    ok(cpu_stat.m_delay_start == delay_start, "delay start %ld",
+       cpu_stat.m_delay_start);
+    ok(cpu_stat.m_delay_total_ns == delay_total, "delay total %ld",
+       cpu_stat.m_delay_total_ns);
+    ok(cpu_stat.m_cpu_start == quantum_start, "cpu start %ld",
+       cpu_stat.m_cpu_start);
+    ok(cpu_stat.m_cpu_total_ns == cpu_total, "cpu total %ld",
+       cpu_stat.m_cpu_total_ns);
+  }
+};
+
+static void test_cpu_stats_operations() {
+  PSI_thread_service_t *thread_service;
+  PSI_mutex_service_t *mutex_service;
+  PSI_rwlock_service_t *rwlock_service;
+  PSI_cond_service_t *cond_service;
+  PSI_file_service_t *file_service;
+  PSI_socket_service_t *socket_service;
+  PSI_table_service_t *table_service;
+  PSI_mdl_service_t *mdl_service;
+  PSI_idle_service_t *idle_service;
+  PSI_stage_service_t *stage_service;
+  PSI_statement_service_t *statement_service;
+  PSI_transaction_service_t *transaction_service;
+  PSI_memory_service_t *memory_service;
+  PSI_error_service_t *error_service;
+  PSI_data_lock_service_t *data_lock_service;
+  PSI_system_service_t *system_service;
+  PSI_tls_channel_service_t *tls_channel_service;
+
+  diag("test_cpu_stats_operations");
+
+  load_perfschema(&thread_service, &mutex_service, &rwlock_service,
+                  &cond_service, &file_service, &socket_service, &table_service,
+                  &mdl_service, &idle_service, &stage_service,
+                  &statement_service, &transaction_service, &memory_service,
+                  &error_service, &data_lock_service, &system_service,
+                  &tls_channel_service);
+
+  PSI_thread_key thread_key_1;
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
+  thread_service->register_thread("test", all_thread, 1);
+
+  // Preparation.
+  PSI_thread *thread_1 =
+      thread_service->new_thread(thread_key_1, 12, nullptr, 0);
+  ok(thread_1 != nullptr, "T-1");
+
+  // Test object to simplify stats validation.
+  Cpu_stats_test t(reinterpret_cast<PFS_thread *>(thread_1)->m_cpu_sched_stat);
+
+  // New thread should have the stats reset.
+  t.validate_cpu_stats();
+
+  // New query starts as a task enqueue which sets the first delay start.
+  diag("thread_start_delay 1");
+  t.delay_start = 100;
+  thread_service->thread_start_delay(thread_1, t.delay_start);
+  t.validate_cpu_stats();
+
+  // When worker picks up the task it starts running first quantum.
+  diag("thread_start_quantum 1");
+  t.quantum_start = 120;
+  t.delay_total = t.quantum_start - t.delay_start;
+  t.delay_start = 0;
+  thread_service->thread_start_quantum(thread_1, t.quantum_start);
+  t.validate_cpu_stats();
+
+  // Task calls thd_wait_begin and leaves scheduler.
+  diag("thread_end_quantum 1");
+  int64_t quantum_end = 150;
+  t.cpu_total = quantum_end - t.quantum_start;
+  t.quantum_start = 0;
+  t.delay_start = quantum_end;
+  thread_service->thread_end_quantum(thread_1, quantum_end);
+  t.validate_cpu_stats();
+
+  // If somehow quantum ends again, it is ignored.
+  diag("thread_end_quantum 2");
+  quantum_end = 155;
+  thread_service->thread_end_quantum(thread_1, quantum_end);
+  t.validate_cpu_stats();
+
+  // Task calls thd_wait_end and enters scheduler.
+  diag("thread_start_quantum 2");
+  t.quantum_start = 160;
+  t.delay_total += t.quantum_start - t.delay_start;
+  t.delay_start = 0;
+  thread_service->thread_start_quantum(thread_1, t.quantum_start);
+  t.validate_cpu_stats();
+
+  // Task wants to yield, thd_wait_begin skips leaving scheduler,
+  // thd_wait_end enters scheduler. No other tasks are on scheduler so this
+  // task keeps running without ending quantum. Start quantum call is ignored.
+  // If delay start is called, it would be recorded but later end quantum will
+  // override it.
+  diag("thread_start_delay 2");
+  t.delay_start = 169;
+  thread_service->thread_start_delay(thread_1, t.delay_start);
+  t.validate_cpu_stats();
+  diag("thread_start_quantum 3");
+  int64_t quantum_start2 = 170;
+  thread_service->thread_start_quantum(thread_1, quantum_start2);
+  t.validate_cpu_stats();
+
+  // Task yields again, this time some other task waits to be scheduled.
+  // So quantum ends and then starts.
+  diag("thread_start_delay 3");
+  t.delay_start = 199;
+  thread_service->thread_start_delay(thread_1, t.delay_start);
+  t.validate_cpu_stats();
+
+  diag("thread_end_quantum 3");
+  quantum_end = 200;
+  t.delay_start = quantum_end;
+  t.cpu_total += quantum_end - t.quantum_start;
+  t.quantum_start = 0;
+  thread_service->thread_end_quantum(thread_1, quantum_end);
+  t.validate_cpu_stats();
+
+  diag("thread_start_quantum 4");
+  t.quantum_start = 210;
+  t.delay_total += t.quantum_start - t.delay_start;
+  t.delay_start = 0;
+  thread_service->thread_start_quantum(thread_1, t.quantum_start);
+  t.validate_cpu_stats();
+
+  // Task is about to be done. No need to record anything, just reset
+  // stats before next task on this thread.
+  diag("thread_reset_cpu_stats 1");
+  t.delay_start = 0;
+  t.quantum_start = 0;
+  t.delay_total = 0;
+  t.cpu_total = 0;
+  thread_service->thread_reset_cpu_stats(thread_1);
+  t.validate_cpu_stats();
+
+  thread_service->delete_thread(thread_1);
+  shutdown_performance_schema();
+}
+
 static void do_all_tests() {
   /* system charset needed by pfs_statements_digest */
   system_charset_info = &my_charset_latin1;
@@ -2663,10 +2819,12 @@ static void do_all_tests() {
   test_leaks();
   test_file_operations();
   test_terminology_use_previous();
+  test_cpu_stats_operations();
 }
 
 int main(int, char **) {
-  plan(420);
+  // This is the expected number of ok's in all tests.
+  plan(469);
 
   MY_INIT("pfs-t");
   do_all_tests();