diff options
Diffstat (limited to 'mysql-test/suite/perfschema/t')
53 files changed, 325 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/t/dml_accounts.test b/mysql-test/suite/perfschema/t/dml_accounts.test index e462847279c..84c6cee93ef 100644 --- a/mysql-test/suite/perfschema/t/dml_accounts.test +++ b/mysql-test/suite/perfschema/t/dml_accounts.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.accounts WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='accounts'; diff --git a/mysql-test/suite/perfschema/t/dml_cond_instances.test b/mysql-test/suite/perfschema/t/dml_cond_instances.test index d80c97cbd31..3d3d019480d 100644 --- a/mysql-test/suite/perfschema/t/dml_cond_instances.test +++ b/mysql-test/suite/perfschema/t/dml_cond_instances.test @@ -33,3 +33,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.cond_instances WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='cond_instances'; diff --git a/mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test index b9633ec8ea7..fb54b332c23 100644 --- a/mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_summary_by_account_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test index bb973cd31ed..e7a8e465e89 100644 --- a/mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_summary_by_host_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test index 50fc1fff848..f7675363e82 100644 --- a/mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_summary_by_thread_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test index a3f0bdfd5c9..d0e126645db 100644 --- a/mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_summary_by_user_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test index 8f466517a90..bca0e4ededc 100644 --- a/mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_summary_global_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_summary_global_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test index 92e58c83a56..f86baaef040 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_by_account_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_digest.test b/mysql-test/suite/perfschema/t/dml_esms_by_digest.test index b71c6f2815b..5bdeeb1085e 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_by_digest.test +++ b/mysql-test/suite/perfschema/t/dml_esms_by_digest.test @@ -61,3 +61,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_by_digest WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_by_digest'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test index 7a8c0498a97..19547d991f4 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_by_host_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test index 5c079ade643..f28ae4d3a40 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_by_thread_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test index 21b65e182d3..db6d2d845c3 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_by_user_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test index 5ef477aea6f..108efeee981 100644 --- a/mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_summary_global_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_summary_global_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_events_stages_current.test b/mysql-test/suite/perfschema/t/dml_events_stages_current.test index 8db105fe01e..20dc1927ca1 100644 --- a/mysql-test/suite/perfschema/t/dml_events_stages_current.test +++ b/mysql-test/suite/perfschema/t/dml_events_stages_current.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_current WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_current'; diff --git a/mysql-test/suite/perfschema/t/dml_events_stages_history.test b/mysql-test/suite/perfschema/t/dml_events_stages_history.test index 54bebc8a328..ab62e23ab87 100644 --- a/mysql-test/suite/perfschema/t/dml_events_stages_history.test +++ b/mysql-test/suite/perfschema/t/dml_events_stages_history.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_history WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_history'; diff --git a/mysql-test/suite/perfschema/t/dml_events_stages_history_long.test b/mysql-test/suite/perfschema/t/dml_events_stages_history_long.test index b52f539871d..ef342f1af2c 100644 --- a/mysql-test/suite/perfschema/t/dml_events_stages_history_long.test +++ b/mysql-test/suite/perfschema/t/dml_events_stages_history_long.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_stages_history_long WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_stages_history_long'; diff --git a/mysql-test/suite/perfschema/t/dml_events_statements_current.test b/mysql-test/suite/perfschema/t/dml_events_statements_current.test index 152d9b74d42..1bf00320ac8 100644 --- a/mysql-test/suite/perfschema/t/dml_events_statements_current.test +++ b/mysql-test/suite/perfschema/t/dml_events_statements_current.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_current WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_current'; diff --git a/mysql-test/suite/perfschema/t/dml_events_statements_history.test b/mysql-test/suite/perfschema/t/dml_events_statements_history.test index 4b84e6e7200..7e5e0d387f9 100644 --- a/mysql-test/suite/perfschema/t/dml_events_statements_history.test +++ b/mysql-test/suite/perfschema/t/dml_events_statements_history.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_history WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_history'; diff --git a/mysql-test/suite/perfschema/t/dml_events_statements_history_long.test b/mysql-test/suite/perfschema/t/dml_events_statements_history_long.test index 79580fcf13e..bc481fe1c4f 100644 --- a/mysql-test/suite/perfschema/t/dml_events_statements_history_long.test +++ b/mysql-test/suite/perfschema/t/dml_events_statements_history_long.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_statements_history_long WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_statements_history_long'; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_current.test b/mysql-test/suite/perfschema/t/dml_events_waits_current.test index e59802d0f25..15f1e716e26 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_current.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_current.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_current WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_current'; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_history.test b/mysql-test/suite/perfschema/t/dml_events_waits_history.test index bd9ac2f438e..0ecb4c204c4 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_history.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_history WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_history'; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test index d5e9f0630e0..a5857548e01 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test @@ -45,3 +45,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_history_long WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_history_long'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test index e9eda8ece2a..ca33c15ce19 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_by_account_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test index add375bf6c1..f2123fa01f4 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_by_host_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_instance.test b/mysql-test/suite/perfschema/t/dml_ews_by_instance.test index 9b9dddfa48d..0645dadd34a 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_instance.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_instance.test @@ -52,3 +52,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_by_instance'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test index 763961dec4e..1b1e0147d12 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_by_thread_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test index 1b927dd12a6..4e89ec7a925 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_by_user_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test index ac4829640fb..d32e23ff1d2 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='events_waits_summary_global_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test index c708c31ed55..e5d1e9903ec 100644 --- a/mysql-test/suite/perfschema/t/dml_file_instances.test +++ b/mysql-test/suite/perfschema/t/dml_file_instances.test @@ -34,6 +34,13 @@ UNLOCK TABLES; LOCK TABLES performance_schema.file_instances WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='file_instances'; + --echo ### --echo ### Bug#26152751: INNODB LEAKS MEMORY, PERFORMANCE_SCHEMA FILE_INSTANCES --echo ### #SQL-IB3129987-252773.IBD diff --git a/mysql-test/suite/perfschema/t/dml_fs_by_event_name.test b/mysql-test/suite/perfschema/t/dml_fs_by_event_name.test index dbf31d1963d..50c6486e625 100644 --- a/mysql-test/suite/perfschema/t/dml_fs_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_fs_by_event_name.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.file_summary_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='file_summary_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_fs_by_instance.test b/mysql-test/suite/perfschema/t/dml_fs_by_instance.test index 5f69c2d0dc7..f175e76f1f0 100644 --- a/mysql-test/suite/perfschema/t/dml_fs_by_instance.test +++ b/mysql-test/suite/perfschema/t/dml_fs_by_instance.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.file_summary_by_instance WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='file_summary_by_instance'; diff --git a/mysql-test/suite/perfschema/t/dml_host_cache.test b/mysql-test/suite/perfschema/t/dml_host_cache.test index c56099ab748..3968c08fb30 100644 --- a/mysql-test/suite/perfschema/t/dml_host_cache.test +++ b/mysql-test/suite/perfschema/t/dml_host_cache.test @@ -41,3 +41,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.host_cache WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='host_cache'; diff --git a/mysql-test/suite/perfschema/t/dml_hosts.test b/mysql-test/suite/perfschema/t/dml_hosts.test index d23f6f69339..83caed37d8d 100644 --- a/mysql-test/suite/perfschema/t/dml_hosts.test +++ b/mysql-test/suite/perfschema/t/dml_hosts.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.hosts WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='hosts'; diff --git a/mysql-test/suite/perfschema/t/dml_mutex_instances.test b/mysql-test/suite/perfschema/t/dml_mutex_instances.test index ac3a7c788a8..c0d6f2e54b6 100644 --- a/mysql-test/suite/perfschema/t/dml_mutex_instances.test +++ b/mysql-test/suite/perfschema/t/dml_mutex_instances.test @@ -33,3 +33,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.mutex_instances WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='mutex_instances'; diff --git a/mysql-test/suite/perfschema/t/dml_os_global_by_type.test b/mysql-test/suite/perfschema/t/dml_os_global_by_type.test index 1ea8381bc56..010423f9205 100644 --- a/mysql-test/suite/perfschema/t/dml_os_global_by_type.test +++ b/mysql-test/suite/perfschema/t/dml_os_global_by_type.test @@ -55,3 +55,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.objects_summary_global_by_type WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='objects_summary_global_by_type'; diff --git a/mysql-test/suite/perfschema/t/dml_performance_timers.test b/mysql-test/suite/perfschema/t/dml_performance_timers.test index 587c54144aa..af6d2a2aac9 100644 --- a/mysql-test/suite/perfschema/t/dml_performance_timers.test +++ b/mysql-test/suite/perfschema/t/dml_performance_timers.test @@ -35,3 +35,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.performance_timers WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='performance_timers'; diff --git a/mysql-test/suite/perfschema/t/dml_rwlock_instances.test b/mysql-test/suite/perfschema/t/dml_rwlock_instances.test index 7832a02ccb8..1230c680f75 100644 --- a/mysql-test/suite/perfschema/t/dml_rwlock_instances.test +++ b/mysql-test/suite/perfschema/t/dml_rwlock_instances.test @@ -33,3 +33,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.rwlock_instances WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='rwlock_instances'; diff --git a/mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test b/mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test index 82768cb0d6b..3ed60c5780c 100644 --- a/mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test +++ b/mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test @@ -1,3 +1,5 @@ +# Tests for PERFORMANCE_SCHEMA + --source include/not_embedded.inc --source include/have_perfschema.inc @@ -36,3 +38,10 @@ UNLOCK TABLES; -- error ER_TABLEACCESS_DENIED_ERROR LOCK TABLES performance_schema.session_account_connect_attrs WRITE; UNLOCK TABLES; + +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='session_account_connect_attrs'; diff --git a/mysql-test/suite/perfschema/t/dml_session_connect_attrs.test b/mysql-test/suite/perfschema/t/dml_session_connect_attrs.test index db2bcb7afd6..b0a40d73a7b 100644 --- a/mysql-test/suite/perfschema/t/dml_session_connect_attrs.test +++ b/mysql-test/suite/perfschema/t/dml_session_connect_attrs.test @@ -1,3 +1,5 @@ +# Tests for PERFORMANCE_SCHEMA + --source include/not_embedded.inc --source include/have_perfschema.inc @@ -36,3 +38,10 @@ UNLOCK TABLES; -- error ER_TABLEACCESS_DENIED_ERROR LOCK TABLES performance_schema.session_connect_attrs WRITE; UNLOCK TABLES; + +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='session_connect_attrs'; diff --git a/mysql-test/suite/perfschema/t/dml_setup_actors.test b/mysql-test/suite/perfschema/t/dml_setup_actors.test index f74fa9b5581..e6c17de37dc 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_actors.test +++ b/mysql-test/suite/perfschema/t/dml_setup_actors.test @@ -139,3 +139,9 @@ insert into performance_schema.setup_actors select * from test.setup_actors; drop table test.setup_actors; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='setup_actors'; diff --git a/mysql-test/suite/perfschema/t/dml_setup_consumers.test b/mysql-test/suite/perfschema/t/dml_setup_consumers.test index 7a95e5d48c1..78eeca01990 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_consumers.test +++ b/mysql-test/suite/perfschema/t/dml_setup_consumers.test @@ -38,3 +38,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.setup_consumers WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='setup_consumers'; diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index 9d178ef201c..f66f8d28176 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -101,3 +101,10 @@ ORDER BY RAND(); update performance_schema.setup_instruments set enabled='YES', TIMED='YES'; + +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='setup_instruments'; diff --git a/mysql-test/suite/perfschema/t/dml_setup_objects.test b/mysql-test/suite/perfschema/t/dml_setup_objects.test index 1f4765a0c70..3055cd8b007 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_objects.test +++ b/mysql-test/suite/perfschema/t/dml_setup_objects.test @@ -94,3 +94,9 @@ insert into performance_schema.setup_objects select * from test.setup_objects; drop table test.setup_objects; SET sql_mode = default; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='setup_objects'; diff --git a/mysql-test/suite/perfschema/t/dml_setup_timers.test b/mysql-test/suite/perfschema/t/dml_setup_timers.test index 10988d54bc3..6a90c669bf2 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_timers.test +++ b/mysql-test/suite/perfschema/t/dml_setup_timers.test @@ -68,3 +68,9 @@ update performance_schema.setup_timers select * from performance_schema.setup_timers; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='setup_timers'; diff --git a/mysql-test/suite/perfschema/t/dml_socket_instances.test b/mysql-test/suite/perfschema/t/dml_socket_instances.test index 929853d574e..2f92c0f5c6e 100644 --- a/mysql-test/suite/perfschema/t/dml_socket_instances.test +++ b/mysql-test/suite/perfschema/t/dml_socket_instances.test @@ -33,3 +33,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.socket_instances WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='socket_instances'; diff --git a/mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test b/mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test index 2c06fca77e4..3fbea327e37 100644 --- a/mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.socket_summary_by_event_name WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='socket_summary_by_event_name'; diff --git a/mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test b/mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test index 5a5d829308c..d55cf2434de 100644 --- a/mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test +++ b/mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.socket_summary_by_instance WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='socket_summary_by_instance'; diff --git a/mysql-test/suite/perfschema/t/dml_threads.test b/mysql-test/suite/perfschema/t/dml_threads.test index 328f6a6d989..f6239d58690 100644 --- a/mysql-test/suite/perfschema/t/dml_threads.test +++ b/mysql-test/suite/perfschema/t/dml_threads.test @@ -48,3 +48,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.threads WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='threads'; diff --git a/mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test b/mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test index ecd83987291..e3b6405a782 100644 --- a/mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test +++ b/mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='table_io_waits_summary_by_index_usage'; diff --git a/mysql-test/suite/perfschema/t/dml_tiws_by_table.test b/mysql-test/suite/perfschema/t/dml_tiws_by_table.test index 4d2f9b7fba5..c00cec31bc5 100644 --- a/mysql-test/suite/perfschema/t/dml_tiws_by_table.test +++ b/mysql-test/suite/perfschema/t/dml_tiws_by_table.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.table_io_waits_summary_by_table WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='table_io_waits_summary_by_table'; diff --git a/mysql-test/suite/perfschema/t/dml_tlws_by_table.test b/mysql-test/suite/perfschema/t/dml_tlws_by_table.test index b88ca1a66aa..ab76d85ffad 100644 --- a/mysql-test/suite/perfschema/t/dml_tlws_by_table.test +++ b/mysql-test/suite/perfschema/t/dml_tlws_by_table.test @@ -40,3 +40,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.table_lock_waits_summary_by_table WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='table_lock_waits_summary_by_table'; diff --git a/mysql-test/suite/perfschema/t/dml_users.test b/mysql-test/suite/perfschema/t/dml_users.test index 290a6d7f253..68942d27763 100644 --- a/mysql-test/suite/perfschema/t/dml_users.test +++ b/mysql-test/suite/perfschema/t/dml_users.test @@ -39,3 +39,9 @@ UNLOCK TABLES; LOCK TABLES performance_schema.users WRITE; UNLOCK TABLES; +--echo # +--echo # MDEV-25325 column_comment for performance_schema tables +--echo # +select column_name, column_comment +from information_schema.columns +where table_schema='performance_schema' and table_name='users'; diff --git a/mysql-test/suite/perfschema/t/table_schema.test b/mysql-test/suite/perfschema/t/table_schema.test index ce53c088c51..935bd667f2d 100644 --- a/mysql-test/suite/perfschema/t/table_schema.test +++ b/mysql-test/suite/perfschema/t/table_schema.test @@ -55,3 +55,8 @@ select count(*) into @count_object_unsigned from information_schema.columns select (@count_object_columns - @count_object_unsigned) = 0; +# Confirm that all columns have comments +# +select count(*) from information_schema.columns + where table_schema="performance_schema" + and (column_comment is null or column_comment = ''); |