Expand performance_schema tables definitions with column comments

Cover all columns that did not have comments. Adjust docs based off of
MariaDB implementation.

24 files changed, 315 insertions, 315 deletions

diff --git a/storage/perfschema/table_esms_by_program.cc b/storage/perfschema/table_esms_by_program.cc
index 3cb2e4a4d46..59202230ef0 100644
--- a/storage/perfschema/table_esms_by_program.cc
+++ b/storage/perfschema/table_esms_by_program.cc
@@ -53,38 +53,38 @@ table_esms_by_program::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_statements_summary_by_program ("
-                      "OBJECT_TYPE enum('EVENT', 'FUNCTION', 'PROCEDURE', 'TABLE', 'TRIGGER'),"
-                      "OBJECT_SCHEMA varchar(64) NOT NULL,"
-                      "OBJECT_NAME varchar(64) NOT NULL,"
-                      "COUNT_STAR bigint(20) unsigned NOT NULL,"
-                      "SUM_TIMER_WAIT bigint(20) unsigned NOT NULL,"
-                      "MIN_TIMER_WAIT bigint(20) unsigned NOT NULL,"
-                      "AVG_TIMER_WAIT bigint(20) unsigned NOT NULL,"
-                      "MAX_TIMER_WAIT bigint(20) unsigned NOT NULL,"
-                      "COUNT_STATEMENTS bigint(20) unsigned NOT NULL,"
-                      "SUM_STATEMENTS_WAIT bigint(20) unsigned NOT NULL,"
-                      "MIN_STATEMENTS_WAIT bigint(20) unsigned NOT NULL,"
-                      "AVG_STATEMENTS_WAIT bigint(20) unsigned NOT NULL,"
-                      "MAX_STATEMENTS_WAIT bigint(20) unsigned NOT NULL,"
-                      "SUM_LOCK_TIME bigint(20) unsigned NOT NULL,"
-                      "SUM_ERRORS bigint(20) unsigned NOT NULL,"
-                      "SUM_WARNINGS bigint(20) unsigned NOT NULL,"
-                      "SUM_ROWS_AFFECTED bigint(20) unsigned NOT NULL,"
-                      "SUM_ROWS_SENT bigint(20) unsigned NOT NULL,"
-                      "SUM_ROWS_EXAMINED bigint(20) unsigned NOT NULL,"
-                      "SUM_CREATED_TMP_DISK_TABLES bigint(20) unsigned NOT NULL,"
-                      "SUM_CREATED_TMP_TABLES bigint(20) unsigned NOT NULL,"
-                      "SUM_SELECT_FULL_JOIN bigint(20) unsigned NOT NULL,"
-                      "SUM_SELECT_FULL_RANGE_JOIN bigint(20) unsigned NOT NULL,"
-                      "SUM_SELECT_RANGE bigint(20) unsigned NOT NULL,"
-                      "SUM_SELECT_RANGE_CHECK bigint(20) unsigned NOT NULL,"
-                      "SUM_SELECT_SCAN bigint(20) unsigned NOT NULL,"
-                      "SUM_SORT_MERGE_PASSES bigint(20) unsigned NOT NULL,"
-                      "SUM_SORT_RANGE bigint(20) unsigned NOT NULL,"
-                      "SUM_SORT_ROWS bigint(20) unsigned NOT NULL,"
-                      "SUM_SORT_SCAN bigint(20) unsigned NOT NULL,"
-                      "SUM_NO_INDEX_USED bigint(20) unsigned NOT NULL,"
-                      "SUM_NO_GOOD_INDEX_USED bigint(20) unsigned NOT NULL)")},
+                      "OBJECT_TYPE enum('EVENT', 'FUNCTION', 'PROCEDURE', 'TABLE', 'TRIGGER') comment 'Object type for which the summary is generated.',"
+                      "OBJECT_SCHEMA varchar(64) NOT NULL comment 'The schema of the object for which the summary is generated.',"
+                      "OBJECT_NAME varchar(64) NOT NULL comment 'The name of the object for which the summary is generated.',"
+                      "COUNT_STAR bigint(20) unsigned NOT NULL comment 'The number of summarized events (from events_statements_current). This value includes all events, whether timed or nontimed.',"
+                      "SUM_TIMER_WAIT bigint(20) unsigned NOT NULL comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+                      "MIN_TIMER_WAIT bigint(20) unsigned NOT NULL comment 'The minimum wait time of the summarized timed events.',"
+                      "AVG_TIMER_WAIT bigint(20) unsigned NOT NULL comment 'The average wait time of the summarized timed events.',"
+                      "MAX_TIMER_WAIT bigint(20) unsigned NOT NULL comment 'The maximum wait time of the summarized timed events.',"
+                      "COUNT_STATEMENTS bigint(20) unsigned NOT NULL comment 'Total number of nested statements invoked during stored program execution.',"
+                      "SUM_STATEMENTS_WAIT bigint(20) unsigned NOT NULL comment 'The total wait time of the summarized timed statements. This value is calculated only for timed statements because nontimed statements have a wait time of NULL. The same is true for the other xxx_STATEMENT_WAIT values.',"
+                      "MIN_STATEMENTS_WAIT bigint(20) unsigned NOT NULL comment 'The minimum wait time of the summarized timed statements.',"
+                      "AVG_STATEMENTS_WAIT bigint(20) unsigned NOT NULL comment 'The average wait time of the summarized timed statements.',"
+                      "MAX_STATEMENTS_WAIT bigint(20) unsigned NOT NULL comment 'The maximum wait time of the summarized timed statements.',"
+                      "SUM_LOCK_TIME bigint(20) unsigned NOT NULL comment 'The total time spent (in picoseconds) waiting for table locks for the summarized statements.',"
+                      "SUM_ERRORS bigint(20) unsigned NOT NULL comment 'The total number of errors that occurend for the summarized statements.',"
+                      "SUM_WARNINGS bigint(20) unsigned NOT NULL comment 'The total number of warnings that occurend for the summarized statements.',"
+                      "SUM_ROWS_AFFECTED bigint(20) unsigned NOT NULL comment 'The total number of affected rows by the summarized statements.',"
+                      "SUM_ROWS_SENT bigint(20) unsigned NOT NULL comment 'The total number of rows returned by the summarized statements.',"
+                      "SUM_ROWS_EXAMINED bigint(20) unsigned NOT NULL comment 'The total number of rows examined by the summarized statements.',"
+                      "SUM_CREATED_TMP_DISK_TABLES bigint(20) unsigned NOT NULL comment 'The total number of on-disk temporary tables created by the summarized statements.',"
+                      "SUM_CREATED_TMP_TABLES bigint(20) unsigned NOT NULL comment 'The total number of in-memory temporary tables created by the summarized statements.',"
+                      "SUM_SELECT_FULL_JOIN bigint(20) unsigned NOT NULL comment 'The total number of full joins executed by the summarized statements.',"
+                      "SUM_SELECT_FULL_RANGE_JOIN bigint(20) unsigned NOT NULL comment 'The total number of range search joins executed by the summarized statements.',"
+                      "SUM_SELECT_RANGE bigint(20) unsigned NOT NULL comment 'The total number of joins that used ranges on the first table executed by the summarized statements.',"
+                      "SUM_SELECT_RANGE_CHECK bigint(20) unsigned NOT NULL comment 'The total number of joins that check for key usage after each row executed by the summarized statements.',"
+                      "SUM_SELECT_SCAN bigint(20) unsigned NOT NULL comment 'The total number of joins that did a full scan of the first table executed by the summarized statements.',"
+                      "SUM_SORT_MERGE_PASSES bigint(20) unsigned NOT NULL comment 'The total number of merge passes that the sort algorithm has had to do for the summarized statements.',"
+                      "SUM_SORT_RANGE bigint(20) unsigned NOT NULL comment 'The total number of sorts that were done using ranges for the summarized statements.',"
+                      "SUM_SORT_ROWS bigint(20) unsigned NOT NULL comment 'The total number of sorted rows that were sorted by the summarized statements.',"
+                      "SUM_SORT_SCAN bigint(20) unsigned NOT NULL comment 'The total number of sorts that were done by scanning the table by the summarized statements.',"
+                      "SUM_NO_INDEX_USED bigint(20) unsigned NOT NULL comment 'The total number of statements that performed a table scan without using an index.',"
+                      "SUM_NO_GOOD_INDEX_USED bigint(20) unsigned NOT NULL comment 'The total number of statements where no good index was found.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_ets_by_account_by_event_name.cc b/storage/perfschema/table_ets_by_account_by_event_name.cc
index f951be2104a..801c9db443f 100644
--- a/storage/perfschema/table_ets_by_account_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_account_by_event_name.cc
@@ -50,24 +50,24 @@ table_ets_by_account_by_event_name::m_share=
   sizeof(pos_ets_by_account_by_event_name),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_summary_by_account_by_event_name("
-  "USER CHAR(32) collate utf8_bin default null,"
-  "HOST CHAR(60) collate utf8_bin default null,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "COUNT_STAR BIGINT unsigned not null,"
-  "SUM_TIMER_WAIT BIGINT unsigned not null,"
-  "MIN_TIMER_WAIT BIGINT unsigned not null,"
-  "AVG_TIMER_WAIT BIGINT unsigned not null,"
-  "MAX_TIMER_WAIT BIGINT unsigned not null,"
-  "COUNT_READ_WRITE BIGINT unsigned not null,"
-  "SUM_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MIN_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "AVG_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MAX_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "COUNT_READ_ONLY BIGINT unsigned not null,"
-  "SUM_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MIN_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "AVG_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MAX_TIMER_READ_ONLY BIGINT unsigned not null)")},
+  "USER CHAR(32) collate utf8_bin default null comment 'User for which summary is generated.',"
+  "HOST CHAR(60) collate utf8_bin default null comment 'Host for which summary is generated.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'Event name for which summary is generated.',"
+  "COUNT_STAR BIGINT unsigned not null comment 'The number of summarized events. This value includes all events, whether timed or nontimed.',"
+  "SUM_TIMER_WAIT BIGINT unsigned not null comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+  "MIN_TIMER_WAIT BIGINT unsigned not null comment 'The minimum wait time of the summarized timed events.',"
+  "AVG_TIMER_WAIT BIGINT unsigned not null comment 'The average wait time of the summarized timed events.',"
+  "MAX_TIMER_WAIT BIGINT unsigned not null comment 'The maximum wait time of the summarized timed events.',"
+  "COUNT_READ_WRITE BIGINT unsigned not null comment 'The total number of only READ/WRITE transaction events.',"
+  "SUM_TIMER_READ_WRITE BIGINT unsigned not null comment 'The total wait time of only READ/WRITE transaction events.',"
+  "MIN_TIMER_READ_WRITE BIGINT unsigned not null comment 'The minimum wait time of only READ/WRITE transaction events.',"
+  "AVG_TIMER_READ_WRITE BIGINT unsigned not null comment 'The average wait time of only READ/WRITE transaction events.',"
+  "MAX_TIMER_READ_WRITE BIGINT unsigned not null comment 'The maximum wait time of only READ/WRITE transaction events.',"
+  "COUNT_READ_ONLY BIGINT unsigned not null comment 'The total number of only READ ONLY transaction events.',"
+  "SUM_TIMER_READ_ONLY BIGINT unsigned not null comment 'The total wait time of only READ ONLY transaction events.',"
+  "MIN_TIMER_READ_ONLY BIGINT unsigned not null comment 'The minimum wait time of only READ ONLY transaction events.',"
+  "AVG_TIMER_READ_ONLY BIGINT unsigned not null comment 'The average wait time of only READ ONLY transaction events.',"
+  "MAX_TIMER_READ_ONLY BIGINT unsigned not null comment 'The maximum wait time of only READ ONLY transaction events.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_ets_by_host_by_event_name.cc b/storage/perfschema/table_ets_by_host_by_event_name.cc
index f02936241a0..17cccf372b9 100644
--- a/storage/perfschema/table_ets_by_host_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_host_by_event_name.cc
@@ -51,23 +51,23 @@ table_ets_by_host_by_event_name::m_share=
   sizeof(pos_ets_by_host_by_event_name),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_summary_by_host_by_event_name("
-  "HOST CHAR(60) collate utf8_bin default null,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "COUNT_STAR BIGINT unsigned not null,"
-  "SUM_TIMER_WAIT BIGINT unsigned not null,"
-  "MIN_TIMER_WAIT BIGINT unsigned not null,"
-  "AVG_TIMER_WAIT BIGINT unsigned not null,"
-  "MAX_TIMER_WAIT BIGINT unsigned not null,"
-  "COUNT_READ_WRITE BIGINT unsigned not null,"
-  "SUM_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MIN_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "AVG_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MAX_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "COUNT_READ_ONLY BIGINT unsigned not null,"
-  "SUM_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MIN_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "AVG_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MAX_TIMER_READ_ONLY BIGINT unsigned not null)")},
+  "HOST CHAR(60) collate utf8_bin default null comment 'Host for which summary is generated.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'Event name for which summary is generated.',"
+  "COUNT_STAR BIGINT unsigned not null comment 'The number of summarized events. This value includes all events, whether timed or nontimed.',"
+  "SUM_TIMER_WAIT BIGINT unsigned not null comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+  "MIN_TIMER_WAIT BIGINT unsigned not null comment 'The minimum wait time of the summarized timed events.',"
+  "AVG_TIMER_WAIT BIGINT unsigned not null comment 'The average wait time of the summarized timed events.',"
+  "MAX_TIMER_WAIT BIGINT unsigned not null comment 'The maximum wait time of the summarized timed events.',"
+  "COUNT_READ_WRITE BIGINT unsigned not null comment 'The total number of only READ/WRITE transaction events.',"
+  "SUM_TIMER_READ_WRITE BIGINT unsigned not null comment 'The total wait time of only READ/WRITE transaction events.',"
+  "MIN_TIMER_READ_WRITE BIGINT unsigned not null comment 'The minimum wait time of only READ/WRITE transaction events.',"
+  "AVG_TIMER_READ_WRITE BIGINT unsigned not null comment 'The average wait time of only READ/WRITE transaction events.',"
+  "MAX_TIMER_READ_WRITE BIGINT unsigned not null comment 'The maximum wait time of only READ/WRITE transaction events.',"
+  "COUNT_READ_ONLY BIGINT unsigned not null comment 'The total number of only READ ONLY transaction events.',"
+  "SUM_TIMER_READ_ONLY BIGINT unsigned not null comment 'The total wait time of only READ ONLY transaction events.',"
+  "MIN_TIMER_READ_ONLY BIGINT unsigned not null comment 'The minimum wait time of only READ ONLY transaction events.',"
+  "AVG_TIMER_READ_ONLY BIGINT unsigned not null comment 'The average wait time of only READ ONLY transaction events.',"
+  "MAX_TIMER_READ_ONLY BIGINT unsigned not null comment 'The maximum wait time of only READ ONLY transaction events.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_ets_by_thread_by_event_name.cc b/storage/perfschema/table_ets_by_thread_by_event_name.cc
index 81ebf23bbfb..464bad8c202 100644
--- a/storage/perfschema/table_ets_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_thread_by_event_name.cc
@@ -50,23 +50,23 @@ table_ets_by_thread_by_event_name::m_share=
   sizeof(pos_ets_by_thread_by_event_name),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_summary_by_thread_by_event_name("
-  "THREAD_ID BIGINT unsigned not null,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "COUNT_STAR BIGINT unsigned not null,"
-  "SUM_TIMER_WAIT BIGINT unsigned not null,"
-  "MIN_TIMER_WAIT BIGINT unsigned not null,"
-  "AVG_TIMER_WAIT BIGINT unsigned not null,"
-  "MAX_TIMER_WAIT BIGINT unsigned not null,"
-  "COUNT_READ_WRITE BIGINT unsigned not null,"
-  "SUM_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MIN_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "AVG_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MAX_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "COUNT_READ_ONLY BIGINT unsigned not null,"
-  "SUM_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MIN_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "AVG_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MAX_TIMER_READ_ONLY BIGINT unsigned not null)")},
+  "THREAD_ID BIGINT unsigned not null comment 'Thread for which summary is generated.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'Event name for which summary is generated.',"
+  "COUNT_STAR BIGINT unsigned not null comment 'The number of summarized events. This value includes all events, whether timed or nontimed.',"
+  "SUM_TIMER_WAIT BIGINT unsigned not null comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+  "MIN_TIMER_WAIT BIGINT unsigned not null comment 'The minimum wait time of the summarized timed events.',"
+  "AVG_TIMER_WAIT BIGINT unsigned not null comment 'The average wait time of the summarized timed events.',"
+  "MAX_TIMER_WAIT BIGINT unsigned not null comment 'The maximum wait time of the summarized timed events.',"
+  "COUNT_READ_WRITE BIGINT unsigned not null comment 'The total number of only READ/WRITE transaction events.',"
+  "SUM_TIMER_READ_WRITE BIGINT unsigned not null comment 'The total wait time of only READ/WRITE transaction events.',"
+  "MIN_TIMER_READ_WRITE BIGINT unsigned not null comment 'The minimum wait time of only READ/WRITE transaction events.',"
+  "AVG_TIMER_READ_WRITE BIGINT unsigned not null comment 'The average wait time of only READ/WRITE transaction events.',"
+  "MAX_TIMER_READ_WRITE BIGINT unsigned not null comment 'The maximum wait time of only READ/WRITE transaction events.',"
+  "COUNT_READ_ONLY BIGINT unsigned not null comment 'The total number of only READ ONLY transaction events.',"
+  "SUM_TIMER_READ_ONLY BIGINT unsigned not null comment 'The total wait time of only READ ONLY transaction events.',"
+  "MIN_TIMER_READ_ONLY BIGINT unsigned not null comment 'The minimum wait time of only READ ONLY transaction events.',"
+  "AVG_TIMER_READ_ONLY BIGINT unsigned not null comment 'The average wait time of only READ ONLY transaction events.',"
+  "MAX_TIMER_READ_ONLY BIGINT unsigned not null comment 'The maximum wait time of only READ ONLY transaction events.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_ets_by_user_by_event_name.cc b/storage/perfschema/table_ets_by_user_by_event_name.cc
index 66aae431782..afe0c5f8649 100644
--- a/storage/perfschema/table_ets_by_user_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_user_by_event_name.cc
@@ -50,23 +50,23 @@ table_ets_by_user_by_event_name::m_share=
   sizeof(pos_ets_by_user_by_event_name),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_summary_by_user_by_event_name("
-  "USER CHAR(32) collate utf8_bin default null,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "COUNT_STAR BIGINT unsigned not null,"
-  "SUM_TIMER_WAIT BIGINT unsigned not null,"
-  "MIN_TIMER_WAIT BIGINT unsigned not null,"
-  "AVG_TIMER_WAIT BIGINT unsigned not null,"
-  "MAX_TIMER_WAIT BIGINT unsigned not null,"
-  "COUNT_READ_WRITE BIGINT unsigned not null,"
-  "SUM_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MIN_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "AVG_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MAX_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "COUNT_READ_ONLY BIGINT unsigned not null,"
-  "SUM_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MIN_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "AVG_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MAX_TIMER_READ_ONLY BIGINT unsigned not null)")},
+  "USER CHAR(32) collate utf8_bin default null comment 'User for which summary is generated.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'Event name for which summary is generated.',"
+  "COUNT_STAR BIGINT unsigned not null comment 'The number of summarized events. This value includes all events, whether timed or nontimed.',"
+  "SUM_TIMER_WAIT BIGINT unsigned not null comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+  "MIN_TIMER_WAIT BIGINT unsigned not null comment 'The minimum wait time of the summarized timed events.',"
+  "AVG_TIMER_WAIT BIGINT unsigned not null comment 'The average wait time of the summarized timed events.',"
+  "MAX_TIMER_WAIT BIGINT unsigned not null comment 'The maximum wait time of the summarized timed events.',"
+  "COUNT_READ_WRITE BIGINT unsigned not null comment 'The total number of only READ/WRITE transaction events.',"
+  "SUM_TIMER_READ_WRITE BIGINT unsigned not null comment 'The total wait time of only READ/WRITE transaction events.',"
+  "MIN_TIMER_READ_WRITE BIGINT unsigned not null comment 'The minimum wait time of only READ/WRITE transaction events.',"
+  "AVG_TIMER_READ_WRITE BIGINT unsigned not null comment 'The average wait time of only READ/WRITE transaction events.',"
+  "MAX_TIMER_READ_WRITE BIGINT unsigned not null comment 'The maximum wait time of only READ/WRITE transaction events.',"
+  "COUNT_READ_ONLY BIGINT unsigned not null comment 'The total number of only READ ONLY transaction events.',"
+  "SUM_TIMER_READ_ONLY BIGINT unsigned not null comment 'The total wait time of only READ ONLY transaction events.',"
+  "MIN_TIMER_READ_ONLY BIGINT unsigned not null comment 'The minimum wait time of only READ ONLY transaction events.',"
+  "AVG_TIMER_READ_ONLY BIGINT unsigned not null comment 'The average wait time of only READ ONLY transaction events.',"
+  "MAX_TIMER_READ_ONLY BIGINT unsigned not null comment 'The maximum wait time of only READ ONLY transaction events.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_ets_global_by_event_name.cc b/storage/perfschema/table_ets_global_by_event_name.cc
index 6c13871a746..be3fbb60ac9 100644
--- a/storage/perfschema/table_ets_global_by_event_name.cc
+++ b/storage/perfschema/table_ets_global_by_event_name.cc
@@ -51,22 +51,22 @@ table_ets_global_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_summary_global_by_event_name("
-  "EVENT_NAME VARCHAR(128) not null,"
-  "COUNT_STAR BIGINT unsigned not null,"
-  "SUM_TIMER_WAIT BIGINT unsigned not null,"
-  "MIN_TIMER_WAIT BIGINT unsigned not null,"
-  "AVG_TIMER_WAIT BIGINT unsigned not null,"
-  "MAX_TIMER_WAIT BIGINT unsigned not null,"
-  "COUNT_READ_WRITE BIGINT unsigned not null,"
-  "SUM_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MIN_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "AVG_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "MAX_TIMER_READ_WRITE BIGINT unsigned not null,"
-  "COUNT_READ_ONLY BIGINT unsigned not null,"
-  "SUM_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MIN_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "AVG_TIMER_READ_ONLY BIGINT unsigned not null,"
-  "MAX_TIMER_READ_ONLY BIGINT unsigned not null)")},
+  "EVENT_NAME VARCHAR(128) not null comment 'Event name for which summary is generated.',"
+  "COUNT_STAR BIGINT unsigned not null comment 'The number of summarized events. This value includes all events, whether timed or nontimed.',"
+  "SUM_TIMER_WAIT BIGINT unsigned not null comment 'The total wait time of the summarized timed events. This value is calculated only for timed events because nontimed events have a wait time of NULL. The same is true for the other xxx_TIMER_WAIT values.',"
+  "MIN_TIMER_WAIT BIGINT unsigned not null comment 'The minimum wait time of the summarized timed events.',"
+  "AVG_TIMER_WAIT BIGINT unsigned not null comment 'The average wait time of the summarized timed events.',"
+  "MAX_TIMER_WAIT BIGINT unsigned not null comment 'The maximum wait time of the summarized timed events.',"
+  "COUNT_READ_WRITE BIGINT unsigned not null comment 'The total number of only READ/WRITE transaction events.',"
+  "SUM_TIMER_READ_WRITE BIGINT unsigned not null comment 'The total wait time of only READ/WRITE transaction events.',"
+  "MIN_TIMER_READ_WRITE BIGINT unsigned not null comment 'The minimum wait time of only READ/WRITE transaction events.',"
+  "AVG_TIMER_READ_WRITE BIGINT unsigned not null comment 'The average wait time of only READ/WRITE transaction events.',"
+  "MAX_TIMER_READ_WRITE BIGINT unsigned not null comment 'The maximum wait time of only READ/WRITE transaction events.',"
+  "COUNT_READ_ONLY BIGINT unsigned not null comment 'The total number of only READ ONLY transaction events.',"
+  "SUM_TIMER_READ_ONLY BIGINT unsigned not null comment 'The total wait time of only READ ONLY transaction events.',"
+  "MIN_TIMER_READ_ONLY BIGINT unsigned not null comment 'The minimum wait time of only READ ONLY transaction events.',"
+  "AVG_TIMER_READ_ONLY BIGINT unsigned not null comment 'The average wait time of only READ ONLY transaction events.',"
+  "MAX_TIMER_READ_ONLY BIGINT unsigned not null comment 'The maximum wait time of only READ ONLY transaction events.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_events_stages.cc b/storage/perfschema/table_events_stages.cc
index 0b65e0ee438..dedfd92f9ec 100644
--- a/storage/perfschema/table_events_stages.cc
+++ b/storage/perfschema/table_events_stages.cc
@@ -57,10 +57,10 @@ table_events_stages_current::m_share=
                       "TIMER_START BIGINT unsigned comment 'Value in picoseconds when the event timing started or NULL if timing is not collected.',"
                       "TIMER_END BIGINT unsigned comment 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',"
                       "TIMER_WAIT BIGINT unsigned comment 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',"
-                      "WORK_COMPLETED BIGINT unsigned,"
-                      "WORK_ESTIMATED BIGINT unsigned,"
+                      "WORK_COMPLETED BIGINT unsigned comment 'The number of work units completed for the stage. NULL if the stage event progress is not instrumented.',"
+                      "WORK_ESTIMATED BIGINT unsigned comment 'The number of work units expected for the stage. NULL if the stage event progress is not instrumented.',"
                       "NESTING_EVENT_ID BIGINT unsigned comment 'EVENT_ID of event within which this event nests.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either statement, stage or wait.')") },
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either transaction, statement, stage or wait.')") },
   false  /* perpetual */
 };
 
@@ -86,10 +86,10 @@ table_events_stages_history::m_share=
                       "TIMER_START BIGINT unsigned comment 'Value in picoseconds when the event timing started or NULL if timing is not collected.',"
                       "TIMER_END BIGINT unsigned comment 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',"
                       "TIMER_WAIT BIGINT unsigned comment 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',"
-                      "WORK_COMPLETED BIGINT unsigned,"
-                      "WORK_ESTIMATED BIGINT unsigned,"
+                      "WORK_COMPLETED BIGINT unsigned comment 'The number of work units completed for the stage. NULL if the stage event progress is not instrumented.',"
+                      "WORK_ESTIMATED BIGINT unsigned comment 'The number of work units expected for the stage. NULL if the stage event progress is not instrumented.',"
                       "NESTING_EVENT_ID BIGINT unsigned comment 'EVENT_ID of event within which this event nests.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either statement, stage or wait.')") },
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either transaction, statement, stage or wait.')") },
   false  /* perpetual */
 };
 
@@ -115,10 +115,10 @@ table_events_stages_history_long::m_share=
                       "TIMER_START BIGINT unsigned comment 'Value in picoseconds when the event timing started or NULL if timing is not collected.',"
                       "TIMER_END BIGINT unsigned comment 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',"
                       "TIMER_WAIT BIGINT unsigned comment 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',"
-                      "WORK_COMPLETED BIGINT unsigned,"
-                      "WORK_ESTIMATED BIGINT unsigned,"
+                      "WORK_COMPLETED BIGINT unsigned comment 'The number of work units completed for the stage. NULL if the stage event progress is not instrumented.',"
+                      "WORK_ESTIMATED BIGINT unsigned comment 'The number of work units expected for the stage. NULL if the stage event progress is not instrumented.',"
                       "NESTING_EVENT_ID BIGINT unsigned comment 'EVENT_ID of event within which this event nests.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either statement, stage or wait.')") },
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Nesting event type. Either transaction, statement, stage or wait.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_events_statements.cc b/storage/perfschema/table_events_statements.cc
index f615d9d95af..9404bd87fcb 100644
--- a/storage/perfschema/table_events_statements.cc
+++ b/storage/perfschema/table_events_statements.cc
@@ -64,9 +64,9 @@ table_events_statements_current::m_share=
                       "DIGEST VARCHAR(32) comment 'Statement digest.',"
                       "DIGEST_TEXT LONGTEXT comment 'Statement digest text.',"
                       "CURRENT_SCHEMA VARCHAR(64) comment 'Statement''s default database for the statement, or NULL if there was none.',"
-                      "OBJECT_TYPE VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_SCHEMA VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_NAME VARCHAR(64) comment 'Reserved, currently NULL',"
+                      "OBJECT_TYPE VARCHAR(64) comment 'NULL for top level statements. The parent statement object type for nested statements (stored programs).',"
+                      "OBJECT_SCHEMA VARCHAR(64) comment 'NULL for top level statements. The parent statement object schema for nested statements (stored programs).',"
+                      "OBJECT_NAME VARCHAR(64) comment 'NULL for top level statements. The parent statement object name for nested statements (stored programs).',"
                       "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Address in memory of the statement object.',"
                       "MYSQL_ERRNO INTEGER comment 'Error code. See MariaDB Error Codes for a full list.',"
                       "RETURNED_SQLSTATE VARCHAR(5) comment 'The SQLSTATE value.',"
@@ -89,9 +89,9 @@ table_events_statements_current::m_share=
                       "SORT_SCAN BIGINT unsigned not null comment 'Number of sorts performed by the statement which used a full table scan.',"
                       "NO_INDEX_USED BIGINT unsigned not null comment '0 if the statement performed a table scan with an index, 1 if without an index.',"
                       "NO_GOOD_INDEX_USED BIGINT unsigned not null comment '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',"
-                      "NESTING_EVENT_ID BIGINT unsigned comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_LEVEL INT)") },
+                      "NESTING_EVENT_ID BIGINT unsigned comment 'NULL for top level statements. The parent statement event id for nested statements (stored programs).',"
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'NULL for top level statements. The parent statement event type for nested statements (stored programs).',"
+                      "NESTING_EVENT_LEVEL INT comment '0 for top level statements. The parent statement level plus 1 for nested statements (stored programs).')") },
   false  /* perpetual */
 };
 
@@ -122,9 +122,9 @@ table_events_statements_history::m_share=
                       "DIGEST VARCHAR(32) comment 'Statement digest.',"
                       "DIGEST_TEXT LONGTEXT comment 'Statement digest text.',"
                       "CURRENT_SCHEMA VARCHAR(64) comment 'Statement''s default database for the statement, or NULL if there was none.',"
-                      "OBJECT_TYPE VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_SCHEMA VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_NAME VARCHAR(64) comment 'Reserved, currently NULL',"
+                      "OBJECT_TYPE VARCHAR(64) comment 'NULL for top level statements. The parent statement object type for nested statements (stored programs).',"
+                      "OBJECT_SCHEMA VARCHAR(64) comment 'NULL for top level statements. The parent statement object schema for nested statements (stored programs).',"
+                      "OBJECT_NAME VARCHAR(64) comment 'NULL for top level statements. The parent statement object name for nested statements (stored programs).',"
                       "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Address in memory of the statement object.',"
                       "MYSQL_ERRNO INTEGER comment 'Error code. See MariaDB Error Codes for a full list.',"
                       "RETURNED_SQLSTATE VARCHAR(5) comment 'The SQLSTATE value.',"
@@ -147,9 +147,9 @@ table_events_statements_history::m_share=
                       "SORT_SCAN BIGINT unsigned not null comment 'Number of sorts performed by the statement which used a full table scan.',"
                       "NO_INDEX_USED BIGINT unsigned not null comment '0 if the statement performed a table scan with an index, 1 if without an index.',"
                       "NO_GOOD_INDEX_USED BIGINT unsigned not null comment '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',"
-                      "NESTING_EVENT_ID BIGINT unsigned comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_LEVEL INT)") },
+                      "NESTING_EVENT_ID BIGINT unsigned comment 'NULL for top level statements. The parent statement event id for nested statements (stored programs).',"
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'NULL for top level statements. The parent statement event type for nested statements (stored programs).',"
+                      "NESTING_EVENT_LEVEL INT comment '0 for top level statements. The parent statement level plus 1 for nested statements (stored programs).')") },
   false  /* perpetual */
 };
 
@@ -180,9 +180,9 @@ table_events_statements_history_long::m_share=
                       "DIGEST VARCHAR(32) comment 'Statement digest.',"
                       "DIGEST_TEXT LONGTEXT comment 'Statement digest text.',"
                       "CURRENT_SCHEMA VARCHAR(64) comment 'Statement''s default database for the statement, or NULL if there was none.',"
-                      "OBJECT_TYPE VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_SCHEMA VARCHAR(64) comment 'Reserved, currently NULL',"
-                      "OBJECT_NAME VARCHAR(64) comment 'Reserved, currently NULL',"
+                      "OBJECT_TYPE VARCHAR(64) comment 'NULL for top level statements. The parent statement object type for nested statements (stored programs).',"
+                      "OBJECT_SCHEMA VARCHAR(64) comment 'NULL for top level statements. The parent statement object schema for nested statements (stored programs).',"
+                      "OBJECT_NAME VARCHAR(64) comment 'NULL for top level statements. The parent statement object name for nested statements (stored programs).',"
                       "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Address in memory of the statement object.',"
                       "MYSQL_ERRNO INTEGER comment 'Error code. See MariaDB Error Codes for a full list.',"
                       "RETURNED_SQLSTATE VARCHAR(5) comment 'The SQLSTATE value.',"
@@ -205,9 +205,9 @@ table_events_statements_history_long::m_share=
                       "SORT_SCAN BIGINT unsigned not null comment 'Number of sorts performed by the statement which used a full table scan.',"
                       "NO_INDEX_USED BIGINT unsigned not null comment '0 if the statement performed a table scan with an index, 1 if without an index.',"
                       "NO_GOOD_INDEX_USED BIGINT unsigned not null comment '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',"
-                      "NESTING_EVENT_ID BIGINT unsigned comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'Reserved, currently NULL.',"
-                      "NESTING_EVENT_LEVEL INT)") },
+                      "NESTING_EVENT_ID BIGINT unsigned comment 'NULL for top level statements. The parent statement event id for nested statements (stored programs).',"
+                      "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'NULL for top level statements. The parent statement event type for nested statements (stored programs).',"
+                      "NESTING_EVENT_LEVEL INT comment '0 for top level statements. The parent statement level plus 1 for nested statements (stored programs).')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_events_transactions.cc b/storage/perfschema/table_events_transactions.cc
index 1d717979a2f..ef2575b4d8b 100644
--- a/storage/perfschema/table_events_transactions.cc
+++ b/storage/perfschema/table_events_transactions.cc
@@ -51,30 +51,30 @@ table_events_transactions_current::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_current("
-  "THREAD_ID BIGINT unsigned not null,"
-  "EVENT_ID BIGINT unsigned not null,"
-  "END_EVENT_ID BIGINT unsigned,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK'),"
-  "TRX_ID BIGINT unsigned,"
-  "GTID VARCHAR(64),"
-  "XID_FORMAT_ID INTEGER,"
-  "XID_GTRID VARCHAR(130),"
-  "XID_BQUAL VARCHAR(130),"
-  "XA_STATE VARCHAR(64),"
-  "SOURCE VARCHAR(64),"
-  "TIMER_START BIGINT unsigned,"
-  "TIMER_END BIGINT unsigned,"
-  "TIMER_WAIT BIGINT unsigned,"
-  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE'),"
-  "ISOLATION_LEVEL VARCHAR(64),"
-  "AUTOCOMMIT ENUM('YES','NO') not null,"
-  "NUMBER_OF_SAVEPOINTS BIGINT unsigned,"
-  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned,"
-  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned,"
-  "OBJECT_INSTANCE_BEGIN BIGINT unsigned,"
-  "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT'))")},
+  "THREAD_ID BIGINT unsigned not null comment 'The thread associated with the event.',"
+  "EVENT_ID BIGINT unsigned not null comment 'The event id associated with the event.',"
+  "END_EVENT_ID BIGINT unsigned comment 'This column is set to NULL when the event starts and updated to the thread current event number when the event ends.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'The name of the instrument from which the event was collected. This is a NAME value from the setup_instruments table.',"
+  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK') comment 'The current transaction state. The value is ACTIVE (after START TRANSACTION or BEGIN), COMMITTED (after COMMIT), or ROLLED BACK (after ROLLBACK).',"
+  "TRX_ID BIGINT unsigned comment 'Unused.',"
+  "GTID VARCHAR(64) comment 'Transaction GTID, using the format DOMAIN-SERVER_ID-SEQUENCE_NO.',"
+  "XID_FORMAT_ID INTEGER comment 'XA transaction format ID for GTRID and BQUAL values.',"
+  "XID_GTRID VARCHAR(130) comment 'XA global transaction ID.',"
+  "XID_BQUAL VARCHAR(130) comment 'XA transaction branch qualifier.',"
+  "XA_STATE VARCHAR(64) comment 'The state of the XA transaction. The value is ACTIVE (after XA START), IDLE (after XA END), PREPARED (after XA PREPARE), ROLLED BACK (after XA ROLLBACK), or COMMITTED (after XA COMMIT).',"
+  "SOURCE VARCHAR(64) comment 'The name of the source file containing the instrumented code that produced the event and the line number in the file at which the instrumentation occurs.',"
+  "TIMER_START BIGINT unsigned comment 'The unit is picoseconds. When event timing started. NULL if event has no timing information.',"
+  "TIMER_END BIGINT unsigned comment 'The unit is picoseconds. When event timing ended. NULL if event has no timing information.',"
+  "TIMER_WAIT BIGINT unsigned comment 'The unit is picoseconds. Event duration. NULL if event has not timing information.',"
+  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE') comment 'Transaction access mode.',"
+  "ISOLATION_LEVEL VARCHAR(64) comment 'Transaction isolation level. One of: REPEATABLE READ, READ COMMITTED, READ UNCOMMITTED, or SERIALIZABLE.',"
+  "AUTOCOMMIT ENUM('YES','NO') not null comment 'Whether autcommit mode was enabled when the transaction started.',"
+  "NUMBER_OF_SAVEPOINTS BIGINT unsigned comment 'The number of SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned comment 'The number of ROLLBACK_TO_SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned comment 'The number of RELEASE_SAVEPOINT statements issued during the transaction.',"
+  "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Unused.',"
+  "NESTING_EVENT_ID BIGINT unsigned comment 'The EVENT_ID value of the event within which this event is nested.',"
+  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'The nesting event type.')")},
   false  /* perpetual */
 };
 
@@ -92,30 +92,30 @@ table_events_transactions_history::m_share=
   sizeof(pos_events_transactions_history), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_history("
-  "THREAD_ID BIGINT unsigned not null,"
-  "EVENT_ID BIGINT unsigned not null,"
-  "END_EVENT_ID BIGINT unsigned,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK'),"
-  "TRX_ID BIGINT unsigned,"
-  "GTID VARCHAR(64),"
-  "XID_FORMAT_ID INTEGER,"
-  "XID_GTRID VARCHAR(130),"
-  "XID_BQUAL VARCHAR(130),"
-  "XA_STATE VARCHAR(64),"
-  "SOURCE VARCHAR(64),"
-  "TIMER_START BIGINT unsigned,"
-  "TIMER_END BIGINT unsigned,"
-  "TIMER_WAIT BIGINT unsigned,"
-  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE'),"
-  "ISOLATION_LEVEL VARCHAR(64),"
-  "AUTOCOMMIT ENUM('YES','NO') not null,"
-  "NUMBER_OF_SAVEPOINTS BIGINT unsigned,"
-  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned,"
-  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned,"
-  "OBJECT_INSTANCE_BEGIN BIGINT unsigned,"
-  "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT'))")},
+  "THREAD_ID BIGINT unsigned not null comment 'The thread associated with the event.',"
+  "EVENT_ID BIGINT unsigned not null comment 'The event id associated with the event.',"
+  "END_EVENT_ID BIGINT unsigned comment 'This column is set to NULL when the event starts and updated to the thread current event number when the event ends.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'The name of the instrument from which the event was collected. This is a NAME value from the setup_instruments table.',"
+  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK') comment 'The current transaction state. The value is ACTIVE (after START TRANSACTION or BEGIN), COMMITTED (after COMMIT), or ROLLED BACK (after ROLLBACK).',"
+  "TRX_ID BIGINT unsigned comment 'Unused.',"
+  "GTID VARCHAR(64) comment 'Transaction GTID, using the format DOMAIN-SERVER_ID-SEQUENCE_NO.',"
+  "XID_FORMAT_ID INTEGER comment 'XA transaction format ID for GTRID and BQUAL values.',"
+  "XID_GTRID VARCHAR(130) comment 'XA global transaction ID.',"
+  "XID_BQUAL VARCHAR(130) comment 'XA transaction branch qualifier.',"
+  "XA_STATE VARCHAR(64) comment 'The state of the XA transaction. The value is ACTIVE (after XA START), IDLE (after XA END), PREPARED (after XA PREPARE), ROLLED BACK (after XA ROLLBACK), or COMMITTED (after XA COMMIT).',"
+  "SOURCE VARCHAR(64) comment 'The name of the source file containing the instrumented code that produced the event and the line number in the file at which the instrumentation occurs.',"
+  "TIMER_START BIGINT unsigned comment 'The unit is picoseconds. When event timing started. NULL if event has no timing information.',"
+  "TIMER_END BIGINT unsigned comment 'The unit is picoseconds. When event timing ended. NULL if event has no timing information.',"
+  "TIMER_WAIT BIGINT unsigned comment 'The unit is picoseconds. Event duration. NULL if event has not timing information.',"
+  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE') comment 'Transaction access mode.',"
+  "ISOLATION_LEVEL VARCHAR(64) comment 'Transaction isolation level. One of: REPEATABLE READ, READ COMMITTED, READ UNCOMMITTED, or SERIALIZABLE.',"
+  "AUTOCOMMIT ENUM('YES','NO') not null comment 'Whether autcommit mode was enabled when the transaction started.',"
+  "NUMBER_OF_SAVEPOINTS BIGINT unsigned comment 'The number of SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned comment 'The number of ROLLBACK_TO_SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned comment 'The number of RELEASE_SAVEPOINT statements issued during the transaction.',"
+  "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Unused.',"
+  "NESTING_EVENT_ID BIGINT unsigned comment 'The EVENT_ID value of the event within which this event is nested.',"
+  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'The nesting event type.')")},
   false  /* perpetual */
 };
 
@@ -133,30 +133,30 @@ table_events_transactions_history_long::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE events_transactions_history_long("
-  "THREAD_ID BIGINT unsigned not null,"
-  "EVENT_ID BIGINT unsigned not null,"
-  "END_EVENT_ID BIGINT unsigned,"
-  "EVENT_NAME VARCHAR(128) not null,"
-  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK'),"
-  "TRX_ID BIGINT unsigned,"
-  "GTID VARCHAR(64),"
-  "XID_FORMAT_ID INTEGER,"
-  "XID_GTRID VARCHAR(130),"
-  "XID_BQUAL VARCHAR(130),"
-  "XA_STATE VARCHAR(64),"
-  "SOURCE VARCHAR(64),"
-  "TIMER_START BIGINT unsigned,"
-  "TIMER_END BIGINT unsigned,"
-  "TIMER_WAIT BIGINT unsigned,"
-  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE'),"
-  "ISOLATION_LEVEL VARCHAR(64),"
-  "AUTOCOMMIT ENUM('YES','NO') not null,"
-  "NUMBER_OF_SAVEPOINTS BIGINT unsigned,"
-  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned,"
-  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned,"
-  "OBJECT_INSTANCE_BEGIN BIGINT unsigned,"
-  "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT'))")},
+  "THREAD_ID BIGINT unsigned not null comment 'The thread associated with the event.',"
+  "EVENT_ID BIGINT unsigned not null comment 'The event id associated with the event.',"
+  "END_EVENT_ID BIGINT unsigned comment 'This column is set to NULL when the event starts and updated to the thread current event number when the event ends.',"
+  "EVENT_NAME VARCHAR(128) not null comment 'The name of the instrument from which the event was collected. This is a NAME value from the setup_instruments table.',"
+  "STATE ENUM('ACTIVE', 'COMMITTED', 'ROLLED BACK') comment 'The current transaction state. The value is ACTIVE (after START TRANSACTION or BEGIN), COMMITTED (after COMMIT), or ROLLED BACK (after ROLLBACK).',"
+  "TRX_ID BIGINT unsigned comment 'Unused.',"
+  "GTID VARCHAR(64) comment 'Transaction GTID, using the format DOMAIN-SERVER_ID-SEQUENCE_NO.',"
+  "XID_FORMAT_ID INTEGER comment 'XA transaction format ID for GTRID and BQUAL values.',"
+  "XID_GTRID VARCHAR(130) comment 'XA global transaction ID.',"
+  "XID_BQUAL VARCHAR(130) comment 'XA transaction branch qualifier.',"
+  "XA_STATE VARCHAR(64) comment 'The state of the XA transaction. The value is ACTIVE (after XA START), IDLE (after XA END), PREPARED (after XA PREPARE), ROLLED BACK (after XA ROLLBACK), or COMMITTED (after XA COMMIT).',"
+  "SOURCE VARCHAR(64) comment 'The name of the source file containing the instrumented code that produced the event and the line number in the file at which the instrumentation occurs.',"
+  "TIMER_START BIGINT unsigned comment 'The unit is picoseconds. When event timing started. NULL if event has no timing information.',"
+  "TIMER_END BIGINT unsigned comment 'The unit is picoseconds. When event timing ended. NULL if event has no timing information.',"
+  "TIMER_WAIT BIGINT unsigned comment 'The unit is picoseconds. Event duration. NULL if event has not timing information.',"
+  "ACCESS_MODE ENUM('READ ONLY', 'READ WRITE') comment 'Transaction access mode.',"
+  "ISOLATION_LEVEL VARCHAR(64) comment 'Transaction isolation level. One of: REPEATABLE READ, READ COMMITTED, READ UNCOMMITTED, or SERIALIZABLE.',"
+  "AUTOCOMMIT ENUM('YES','NO') not null comment 'Whether autcommit mode was enabled when the transaction started.',"
+  "NUMBER_OF_SAVEPOINTS BIGINT unsigned comment 'The number of SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_ROLLBACK_TO_SAVEPOINT BIGINT unsigned comment 'The number of ROLLBACK_TO_SAVEPOINT statements issued during the transaction.',"
+  "NUMBER_OF_RELEASE_SAVEPOINT BIGINT unsigned comment 'The number of RELEASE_SAVEPOINT statements issued during the transaction.',"
+  "OBJECT_INSTANCE_BEGIN BIGINT unsigned comment 'Unused.',"
+  "NESTING_EVENT_ID BIGINT unsigned comment 'The EVENT_ID value of the event within which this event is nested.',"
+  "NESTING_EVENT_TYPE ENUM('TRANSACTION', 'STATEMENT', 'STAGE', 'WAIT') comment 'The nesting event type.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_global_status.cc b/storage/perfschema/table_global_status.cc
index a8d5bacf2f3..53e6fddef7a 100644
--- a/storage/perfschema/table_global_status.cc
+++ b/storage/perfschema/table_global_status.cc
@@ -47,8 +47,8 @@ table_global_status::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE global_status("
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "VARIABLE_NAME VARCHAR(64) not null comment 'The global status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'The global status variable value.')") },
   true   /* perpetual */
 };
 
diff --git a/storage/perfschema/table_prepared_stmt_instances.cc b/storage/perfschema/table_prepared_stmt_instances.cc
index 6e93523deb4..c63827ec0ed 100644
--- a/storage/perfschema/table_prepared_stmt_instances.cc
+++ b/storage/perfschema/table_prepared_stmt_instances.cc
@@ -53,41 +53,41 @@ table_prepared_stmt_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE prepared_statements_instances("
-  "OBJECT_INSTANCE_BEGIN bigint(20) unsigned NOT NULL,"
-  "STATEMENT_ID bigint(20) unsigned NOT NULL,"
-  "STATEMENT_NAME varchar(64) default NULL,"
-  "SQL_TEXT longtext NOT NULL,"
-  "OWNER_THREAD_ID bigint(20) unsigned NOT NULL,"
-  "OWNER_EVENT_ID bigint(20) unsigned NOT NULL,"
-  "OWNER_OBJECT_TYPE enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER') DEFAULT NULL,"
-  "OWNER_OBJECT_SCHEMA varchar(64) DEFAULT NULL,"
-  "OWNER_OBJECT_NAME varchar(64) DEFAULT NULL,"
-  "TIMER_PREPARE bigint(20) unsigned NOT NULL,"
-  "COUNT_REPREPARE bigint(20) unsigned NOT NULL,"
-  "COUNT_EXECUTE bigint(20) unsigned NOT NULL,"
-  "SUM_TIMER_EXECUTE bigint(20) unsigned NOT NULL,"
-  "MIN_TIMER_EXECUTE bigint(20) unsigned NOT NULL,"
-  "AVG_TIMER_EXECUTE bigint(20) unsigned NOT NULL,"
-  "MAX_TIMER_EXECUTE bigint(20) unsigned NOT NULL,"
-  "SUM_LOCK_TIME bigint(20) unsigned NOT NULL,"
-  "SUM_ERRORS bigint(20) unsigned NOT NULL,"
-  "SUM_WARNINGS bigint(20) unsigned NOT NULL,"
-  "SUM_ROWS_AFFECTED bigint(20) unsigned NOT NULL,"
-  "SUM_ROWS_SENT bigint(20) unsigned NOT NULL,"
-  "SUM_ROWS_EXAMINED bigint(20) unsigned NOT NULL,"
-  "SUM_CREATED_TMP_DISK_TABLES bigint(20) unsigned NOT NULL,"
-  "SUM_CREATED_TMP_TABLES bigint(20) unsigned NOT NULL,"
-  "SUM_SELECT_FULL_JOIN bigint(20) unsigned NOT NULL,"
-  "SUM_SELECT_FULL_RANGE_JOIN bigint(20) unsigned NOT NULL,"
-  "SUM_SELECT_RANGE bigint(20) unsigned NOT NULL,"
-  "SUM_SELECT_RANGE_CHECK bigint(20) unsigned NOT NULL,"
-  "SUM_SELECT_SCAN bigint(20) unsigned NOT NULL,"
-  "SUM_SORT_MERGE_PASSES bigint(20) unsigned NOT NULL,"
-  "SUM_SORT_RANGE bigint(20) unsigned NOT NULL,"
-  "SUM_SORT_ROWS bigint(20) unsigned NOT NULL,"
-  "SUM_SORT_SCAN bigint(20) unsigned NOT NULL,"
-  "SUM_NO_INDEX_USED bigint(20) unsigned NOT NULL,"
-  "SUM_NO_GOOD_INDEX_USED bigint(20) unsigned NOT NULL)")},
+  "OBJECT_INSTANCE_BEGIN bigint(20) unsigned NOT NULL comment 'The address in memory of the instrumented prepared statement.',"
+  "STATEMENT_ID bigint(20) unsigned NOT NULL comment 'The internal statement ID assigned by the server.',"
+  "STATEMENT_NAME varchar(64) default NULL comment 'For the binary protocol, this column is NULL. For the text protocol, this column is the external statement name assigned by the user.',"
+  "SQL_TEXT longtext NOT NULL comment 'The prepared statement text, with ? placeholder markers.',"
+  "OWNER_THREAD_ID bigint(20) unsigned NOT NULL comment 'Event thread id that created the prepared statement.',"
+  "OWNER_EVENT_ID bigint(20) unsigned NOT NULL comment 'Event id that created the prepared statement.',"
+  "OWNER_OBJECT_TYPE enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER') DEFAULT NULL comment 'NULL for a prepared statement created by a client session. Type of the stored program that created the prepared statement.',"
+  "OWNER_OBJECT_SCHEMA varchar(64) DEFAULT NULL comment 'NULL for a prepared statement created by a client session. Schema of the stored program that created the prepared statement.',"
+  "OWNER_OBJECT_NAME varchar(64) DEFAULT NULL comment 'NULL for a prepared statement created by a client session. Name of the stored program that created the prepared statement.',"
+  "TIMER_PREPARE bigint(20) unsigned NOT NULL comment 'The time spent executing the statement preparation itself.',"
+  "COUNT_REPREPARE bigint(20) unsigned NOT NULL comment 'The number of times the statement was reprepared internally.',"
+  "COUNT_EXECUTE bigint(20) unsigned NOT NULL comment 'Total times the prepared statement was executed.',"
+  "SUM_TIMER_EXECUTE bigint(20) unsigned NOT NULL comment 'Total time spent executing all prepared statements.',"
+  "MIN_TIMER_EXECUTE bigint(20) unsigned NOT NULL comment 'Minimum time spent executing any of the prepared statements.',"
+  "AVG_TIMER_EXECUTE bigint(20) unsigned NOT NULL comment 'Average time spent executing any of the prepared statements.',"
+  "MAX_TIMER_EXECUTE bigint(20) unsigned NOT NULL comment 'Maximum time spent executing any of the prepared statements.',"
+  "SUM_LOCK_TIME bigint(20) unsigned NOT NULL comment 'The total time spent (in picoseconds) waiting for table locks for the prepared statements.',"
+  "SUM_ERRORS bigint(20) unsigned NOT NULL comment 'The total number of errors that occurend for the prepared statements.',"
+  "SUM_WARNINGS bigint(20) unsigned NOT NULL comment 'The total number of warnings that occurend for the prepared statements.',"
+  "SUM_ROWS_AFFECTED bigint(20) unsigned NOT NULL comment 'The total number of affected rows by the prepared statements.',"
+  "SUM_ROWS_SENT bigint(20) unsigned NOT NULL comment 'The total number of rows returned by the prepared statements.',"
+  "SUM_ROWS_EXAMINED bigint(20) unsigned NOT NULL comment 'The total number of rows examined by the prepared statements.',"
+  "SUM_CREATED_TMP_DISK_TABLES bigint(20) unsigned NOT NULL comment 'The total number of on-disk temporary tables created by the prepared statements.',"
+  "SUM_CREATED_TMP_TABLES bigint(20) unsigned NOT NULL comment 'The total number of in-memory temporary tables created by the prepared statements.',"
+  "SUM_SELECT_FULL_JOIN bigint(20) unsigned NOT NULL comment 'The total number of full joins executed by the prepared statements.',"
+  "SUM_SELECT_FULL_RANGE_JOIN bigint(20) unsigned NOT NULL comment 'The total number of range search joins executed by the prepared statements.',"
+  "SUM_SELECT_RANGE bigint(20) unsigned NOT NULL comment 'The total number of joins that used ranges on the first table executed by the prepared statements.',"
+  "SUM_SELECT_RANGE_CHECK bigint(20) unsigned NOT NULL comment 'The total number of joins that check for key usage after each row executed by the prepared statements.',"
+  "SUM_SELECT_SCAN bigint(20) unsigned NOT NULL comment 'The total number of joins that did a full scan of the first table executed by the prepared statements.',"
+  "SUM_SORT_MERGE_PASSES bigint(20) unsigned NOT NULL comment 'The total number of merge passes that the sort algorithm has had to do for the prepared statements.',"
+  "SUM_SORT_RANGE bigint(20) unsigned NOT NULL comment 'The total number of sorts that were done using ranges for the prepared statements.',"
+  "SUM_SORT_ROWS bigint(20) unsigned NOT NULL comment 'The total number of sorted rows that were sorted by the prepared statements.',"
+  "SUM_SORT_SCAN bigint(20) unsigned NOT NULL comment 'The total number of sorts that were done by scanning the table by the prepared statements.',"
+  "SUM_NO_INDEX_USED bigint(20) unsigned NOT NULL comment 'The total number of statements that performed a table scan without using an index.',"
+  "SUM_NO_GOOD_INDEX_USED bigint(20) unsigned NOT NULL comment 'The total number of statements where no good index was found.')")},
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_replication_applier_configuration.cc b/storage/perfschema/table_replication_applier_configuration.cc
index 06de6c6e141..d13a6a98b30 100644
--- a/storage/perfschema/table_replication_applier_configuration.cc
+++ b/storage/perfschema/table_replication_applier_configuration.cc
@@ -54,8 +54,8 @@ table_replication_applier_configuration::m_share=
   sizeof(pos_t), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE replication_applier_configuration("
-  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null,"
-  "DESIRED_DELAY INTEGER not null)") },
+  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null comment 'Replication channel name.',"
+  "DESIRED_DELAY INTEGER not null comment 'Desired replica delay functionality not supported by MariaDB. Always 0.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_replication_applier_status.cc b/storage/perfschema/table_replication_applier_status.cc
index 7083d3ac3b9..991418266d2 100644
--- a/storage/perfschema/table_replication_applier_status.cc
+++ b/storage/perfschema/table_replication_applier_status.cc
@@ -55,10 +55,10 @@ table_replication_applier_status::m_share=
   sizeof(pos_t), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE replication_applier_status("
-  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null,"
-  "SERVICE_STATE ENUM('ON','OFF') not null,"
-  "REMAINING_DELAY INTEGER unsigned,"
-  "COUNT_TRANSACTIONS_RETRIES BIGINT unsigned not null)") },
+  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null comment 'The replication channel name.',"
+  "SERVICE_STATE ENUM('ON','OFF') not null comment 'Shows ON when the replication channel''s applier threads are active or idle, OFF means that the applier threads are not active.',"
+  "REMAINING_DELAY INTEGER unsigned comment 'Desired replica delay functionality not supported by MariaDB. Always 0.',"
+  "COUNT_TRANSACTIONS_RETRIES BIGINT unsigned not null comment 'The number of retries that were made because the replication SQL thread failed to apply a transaction.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_replication_applier_status_by_coordinator.cc b/storage/perfschema/table_replication_applier_status_by_coordinator.cc
index beb8620b240..5ef5ac95fdc 100644
--- a/storage/perfschema/table_replication_applier_status_by_coordinator.cc
+++ b/storage/perfschema/table_replication_applier_status_by_coordinator.cc
@@ -55,12 +55,12 @@ table_replication_applier_status_by_coordinator::m_share=
   sizeof(pos_t), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE replication_applier_status_by_coordinator("
-  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null,"
-  "THREAD_ID BIGINT UNSIGNED,"
-  "SERVICE_STATE ENUM('ON','OFF') not null,"
-  "LAST_ERROR_NUMBER INTEGER not null,"
-  "LAST_ERROR_MESSAGE VARCHAR(1024) not null,"
-  "LAST_ERROR_TIMESTAMP TIMESTAMP(0) not null)") },
+  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null comment 'Replication channel name.',"
+  "THREAD_ID BIGINT UNSIGNED comment 'The SQL/coordinator thread ID.',"
+  "SERVICE_STATE ENUM('ON','OFF') not null comment 'ON (thread exists and is active or idle) or OFF (thread no longer exists).',"
+  "LAST_ERROR_NUMBER INTEGER not null comment 'Last error number that caused the SQL/coordinator thread to stop.',"
+  "LAST_ERROR_MESSAGE VARCHAR(1024) not null comment 'Last error message that caused the SQL/coordinator thread to stop.',"
+  "LAST_ERROR_TIMESTAMP TIMESTAMP(0) not null comment 'Timestamp that shows when the most recent SQL/coordinator error occured.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_replication_connection_configuration.cc b/storage/perfschema/table_replication_connection_configuration.cc
index 6d358240332..c93d500842f 100644
--- a/storage/perfschema/table_replication_connection_configuration.cc
+++ b/storage/perfschema/table_replication_connection_configuration.cc
@@ -54,25 +54,25 @@ table_replication_connection_configuration::m_share=
   sizeof(pos_t), /* ref length */
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE replication_connection_configuration("
-  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null,"
-  "HOST CHAR(60) collate utf8_bin not null,"
-  "PORT INTEGER not null,"
-  "USER CHAR(32) collate utf8_bin not null,"
-  "NETWORK_INTERFACE CHAR(60) collate utf8_bin not null,"
-  "AUTO_POSITION ENUM('1','0') not null,"
-  "SSL_ALLOWED ENUM('YES','NO','IGNORED') not null,"
-  "SSL_CA_FILE VARCHAR(512) not null,"
-  "SSL_CA_PATH VARCHAR(512) not null,"
-  "SSL_CERTIFICATE VARCHAR(512) not null,"
-  "SSL_CIPHER VARCHAR(512) not null,"
-  "SSL_KEY VARCHAR(512) not null,"
-  "SSL_VERIFY_SERVER_CERTIFICATE ENUM('YES','NO') not null,"
-  "SSL_CRL_FILE VARCHAR(255) not null,"
-  "SSL_CRL_PATH VARCHAR(255) not null,"
-  "CONNECTION_RETRY_INTERVAL INTEGER not null,"
-  "CONNECTION_RETRY_COUNT BIGINT unsigned not null,"
-  "HEARTBEAT_INTERVAL DOUBLE(10,3) unsigned not null COMMENT 'Number of seconds after which a heartbeat will be sent .',"
-  "TLS_VERSION VARCHAR(255) not null)") },
+  "CHANNEL_NAME CHAR(64) collate utf8_general_ci not null comment 'The replication channel used.',"
+  "HOST CHAR(60) collate utf8_bin not null comment 'The host name of the source that the replica is connected to.',"
+  "PORT INTEGER not null comment 'The port used to connect to the source.',"
+  "USER CHAR(32) collate utf8_bin not null comment 'The user name of the replication user account used to connect to the source.',"
+  "NETWORK_INTERFACE CHAR(60) collate utf8_bin not null comment 'The network interface that the replica is bound to, if any.',"
+  "AUTO_POSITION ENUM('1','0') not null comment '1 if GTID auto-positioning is in use; otherwise 0.',"
+  "SSL_ALLOWED ENUM('YES','NO','IGNORED') not null comment 'Wether SSL is allowed for the replica connection.',"
+  "SSL_CA_FILE VARCHAR(512) not null comment 'Path to the file that contains one or more certificates for trusted Certificate Authorities (CA) to use for TLS.',"
+  "SSL_CA_PATH VARCHAR(512) not null comment 'Path to a directory that contains one or more PEM files that contain X509 certificates for a trusted Certificate Authority (CA) to use for TLS.',"
+  "SSL_CERTIFICATE VARCHAR(512) not null comment 'Path to the certificate used to authenticate the master.',"
+  "SSL_CIPHER VARCHAR(512) not null comment 'Which cipher is used for encription.',"
+  "SSL_KEY VARCHAR(512) not null comment 'Path to the private key used for TLS.',"
+  "SSL_VERIFY_SERVER_CERTIFICATE ENUM('YES','NO') not null comment 'Wether the server certificate is verified as part of the SSL connection',"
+  "SSL_CRL_FILE VARCHAR(255) not null comment 'Path to the PEM file containing one or more revoked X.509 certificates.',"
+  "SSL_CRL_PATH VARCHAR(255) not null comment 'PATH to a folder containing PEM files containing one or more revoked X.509 certificates.',"
+  "CONNECTION_RETRY_INTERVAL INTEGER not null comment 'The number of seconds between connect retries.',"
+  "CONNECTION_RETRY_COUNT BIGINT unsigned not null comment 'The number of times the replica can attempt to reconnect to the source in the event of a lost connection.',"
+  "HEARTBEAT_INTERVAL DOUBLE(10,3) unsigned not null COMMENT 'Number of seconds after which a heartbeat will be sent.',"
+  "TLS_VERSION VARCHAR(255) not null comment 'Not implemented, always blank.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_session_status.cc b/storage/perfschema/table_session_status.cc
index acff99caed0..b9e19b99a69 100644
--- a/storage/perfschema/table_session_status.cc
+++ b/storage/perfschema/table_session_status.cc
@@ -47,8 +47,8 @@ table_session_status::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE session_status("
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "VARIABLE_NAME VARCHAR(64) not null comment 'The session status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'The session status variable value.')") },
   true   /* perpetual */
 };
 
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index b4965553e92..3dadf9a031e 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -53,8 +53,8 @@ table_setup_actors::m_share=
                       "HOST CHAR(" HOSTNAME_LENGTH_STR ") collate utf8_bin default '%' not null comment 'Host name, either a literal, or the % wildcard representing any host.',"
                       "USER CHAR(" USERNAME_CHAR_LENGTH_STR ") collate utf8_bin default '%' not null comment 'User name, either a literal or the % wildcard representing any name.',"
                       "ROLE CHAR(" USERNAME_CHAR_LENGTH_STR ") collate utf8_bin default '%' not null comment 'Unused',"
-                      "ENABLED ENUM('YES', 'NO') not null default 'YES',"
-                      "HISTORY ENUM('YES', 'NO') not null default 'YES')") },
+                      "ENABLED ENUM('YES', 'NO') not null default 'YES' comment 'Whether to enable instrumentation for foreground threads matched by the row.',"
+                      "HISTORY ENUM('YES', 'NO') not null default 'YES' comment 'Whether to log historical events for foreground threads matched by the row.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_status_by_account.cc b/storage/perfschema/table_status_by_account.cc
index 30a1b6db036..6868fab1186 100644
--- a/storage/perfschema/table_status_by_account.cc
+++ b/storage/perfschema/table_status_by_account.cc
@@ -48,10 +48,10 @@ table_status_by_account::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE status_by_account("
-  "USER CHAR(32) collate utf8_bin default null,"
-  "HOST CHAR(60) collate utf8_bin default null,"
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "USER CHAR(32) collate utf8_bin default null comment 'User for which the status variable is reported.',"
+  "HOST CHAR(60) collate utf8_bin default null comment 'Host for which the status variable is reported.',"
+  "VARIABLE_NAME VARCHAR(64) not null comment 'Status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'Aggregated status variable value.' )") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_status_by_host.cc b/storage/perfschema/table_status_by_host.cc
index cd41fcaa469..756414ff06a 100644
--- a/storage/perfschema/table_status_by_host.cc
+++ b/storage/perfschema/table_status_by_host.cc
@@ -48,9 +48,9 @@ table_status_by_host::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE status_by_host("
-  "HOST CHAR(60) collate utf8_bin default null,"
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "HOST CHAR(60) collate utf8_bin default null comment 'Host for which the status variable is reported.',"
+  "VARIABLE_NAME VARCHAR(64) not null comment 'Status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'Aggregated status variable value.' )") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_status_by_thread.cc b/storage/perfschema/table_status_by_thread.cc
index d9af7e49aa4..4c09dfc2b70 100644
--- a/storage/perfschema/table_status_by_thread.cc
+++ b/storage/perfschema/table_status_by_thread.cc
@@ -47,9 +47,9 @@ table_status_by_thread::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE status_by_thread("
-  "THREAD_ID BIGINT unsigned not null,"
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "THREAD_ID BIGINT unsigned not null comment 'The thread identifier of the session in which the status variable is defined.',"
+  "VARIABLE_NAME VARCHAR(64) not null comment 'Status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'Aggregated status variable value.' )") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_status_by_user.cc b/storage/perfschema/table_status_by_user.cc
index 921a72247b6..fb9324bebe7 100644
--- a/storage/perfschema/table_status_by_user.cc
+++ b/storage/perfschema/table_status_by_user.cc
@@ -49,9 +49,9 @@ table_status_by_user::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE status_by_user("
-  "USER CHAR(32) collate utf8_bin default null,"
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE VARCHAR(1024))") },
+  "USER CHAR(32) collate utf8_bin default null comment 'User for which the status variable is reported.',"
+  "VARIABLE_NAME VARCHAR(64) not null comment 'Status variable name.',"
+  "VARIABLE_VALUE VARCHAR(1024) comment 'Aggregated status variable value.' )") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_table_handles.cc b/storage/perfschema/table_table_handles.cc
index ab6ed357687..03431bbf1ad 100644
--- a/storage/perfschema/table_table_handles.cc
+++ b/storage/perfschema/table_table_handles.cc
@@ -50,14 +50,14 @@ table_table_handles::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE table_handles("
-  "OBJECT_TYPE VARCHAR(64) not null,"
-  "OBJECT_SCHEMA VARCHAR(64) not null,"
-  "OBJECT_NAME VARCHAR(64) not null,"
-  "OBJECT_INSTANCE_BEGIN BIGINT unsigned not null,"
-  "OWNER_THREAD_ID BIGINT unsigned,"
-  "OWNER_EVENT_ID BIGINT unsigned,"
-  "INTERNAL_LOCK VARCHAR(64),"
-  "EXTERNAL_LOCK VARCHAR(64))") },
+  "OBJECT_TYPE VARCHAR(64) not null comment 'The table opened by a table handle.',"
+  "OBJECT_SCHEMA VARCHAR(64) not null comment 'The schema that contains the object.',"
+  "OBJECT_NAME VARCHAR(64) not null comment 'The name of the instrumented object.',"
+  "OBJECT_INSTANCE_BEGIN BIGINT unsigned not null comment 'The table handle address in memory.',"
+  "OWNER_THREAD_ID BIGINT unsigned comment 'The thread owning the table handle.',"
+  "OWNER_EVENT_ID BIGINT unsigned comment 'The event which caused the table handle to be opened.',"
+  "INTERNAL_LOCK VARCHAR(64) comment 'The table lock used at the SQL level.',"
+  "EXTERNAL_LOCK VARCHAR(64) comment 'The table lock used at the storage engine level.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index d5c0843438b..fcf0a7ad80e 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -55,9 +55,9 @@ table_threads::m_share=
                       "PARENT_THREAD_ID BIGINT unsigned comment 'THREAD_ID of the parent thread, if any. Subthreads can for example be spawned as a result of INSERT DELAYED statements.',"
                       "ROLE VARCHAR(64) comment 'Unused.',"
                       "INSTRUMENTED ENUM ('YES', 'NO') not null comment 'YES or NO for Whether the thread is instrumented or not. For foreground threads, the initial value is determined by whether there''s a user/host match in the setup_actors table. Subthreads are again matched, while for background threads, this will be set to YES by default. To monitor events that the thread executes, INSTRUMENTED must be YES and the thread_instrumentation consumer in the setup_consumers table must also be YES.',"
-                      "HISTORY ENUM ('YES', 'NO') not null,"
-                      "CONNECTION_TYPE VARCHAR(16),"
-                      "THREAD_OS_ID BIGINT unsigned)") },
+                      "HISTORY ENUM ('YES', 'NO') not null comment 'Whether to log historical events for the thread.',"
+                      "CONNECTION_TYPE VARCHAR(16) comment 'The protocol used to establish the connection, or NULL for background threads.',"
+                      "THREAD_OS_ID BIGINT unsigned comment 'The thread or task identifier as defined by the underlying operating system, if there is one.')") },
   false  /* perpetual */
 };
 
diff --git a/storage/perfschema/table_uvar_by_thread.cc b/storage/perfschema/table_uvar_by_thread.cc
index 77764c002cc..36f142da7ad 100644
--- a/storage/perfschema/table_uvar_by_thread.cc
+++ b/storage/perfschema/table_uvar_by_thread.cc
@@ -141,9 +141,9 @@ table_uvar_by_thread::m_share=
   sizeof(pos_t),
   &m_table_lock,
   { C_STRING_WITH_LEN("CREATE TABLE user_variables_by_thread("
-  "THREAD_ID BIGINT unsigned not null,"
-  "VARIABLE_NAME VARCHAR(64) not null,"
-  "VARIABLE_VALUE LONGBLOB)") },
+  "THREAD_ID BIGINT unsigned not null comment 'The thread identifier of the session in which the variable is defined.',"
+  "VARIABLE_NAME VARCHAR(64) not null comment 'The variable name, without the leading @ character.',"
+  "VARIABLE_VALUE LONGBLOB comment 'The variable value')") },
   false  /* perpetual */
 };