diff options
author | Marc Alff <marc.alff@oracle.com> | 2010-11-03 16:42:33 +0100 |
---|---|---|
committer | Marc Alff <marc.alff@oracle.com> | 2010-11-03 16:42:33 +0100 |
commit | 7f35b15ada5c5b2e63256423c37ce0c907181d85 (patch) | |
tree | cff6f31235af55879a5dfdaeee156837410d852f /storage/perfschema | |
parent | 0329adaef9971f2b9e9cca46dee40900b1b11f48 (diff) | |
download | mariadb-git-7f35b15ada5c5b2e63256423c37ce0c907181d85.tar.gz |
Bug#57609 performance_schema does not work with lower_case_table_names
Before this fix, the performance schema tables were defined in UPPERCASE.
This was incompatible with the lowercase_table_names option, and caused
issues with the install / upgrade process, when changing the lower case
table names setting *after* the install or upgrade.
With this fix, all performance schema tables are exposed with lowercase names.
As a result, the name of the performance schema table is always lowercase,
no matter how / if / when the lowercase_table_names setting if changed.
Diffstat (limited to 'storage/perfschema')
-rw-r--r-- | storage/perfschema/table_events_waits.cc | 6 | ||||
-rw-r--r-- | storage/perfschema/table_events_waits_summary.cc | 4 | ||||
-rw-r--r-- | storage/perfschema/table_ews_global_by_event_name.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_file_instances.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_file_summary.cc | 4 | ||||
-rw-r--r-- | storage/perfschema/table_performance_timers.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_setup_consumers.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_setup_instruments.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_setup_timers.cc | 2 | ||||
-rw-r--r-- | storage/perfschema/table_sync_instances.cc | 6 | ||||
-rw-r--r-- | storage/perfschema/table_threads.cc | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/storage/perfschema/table_events_waits.cc b/storage/perfschema/table_events_waits.cc index d34f6fbe722..d55f0fc2dc8 100644 --- a/storage/perfschema/table_events_waits.cc +++ b/storage/perfschema/table_events_waits.cc @@ -118,7 +118,7 @@ table_events_waits_current::m_field_def= PFS_engine_table_share table_events_waits_current::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_CURRENT") }, + { C_STRING_WITH_LEN("events_waits_current") }, &pfs_truncatable_acl, &table_events_waits_current::create, NULL, /* write_row */ @@ -135,7 +135,7 @@ THR_LOCK table_events_waits_history::m_table_lock; PFS_engine_table_share table_events_waits_history::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_HISTORY") }, + { C_STRING_WITH_LEN("events_waits_history") }, &pfs_truncatable_acl, &table_events_waits_history::create, NULL, /* write_row */ @@ -152,7 +152,7 @@ THR_LOCK table_events_waits_history_long::m_table_lock; PFS_engine_table_share table_events_waits_history_long::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_HISTORY_LONG") }, + { C_STRING_WITH_LEN("events_waits_history_long") }, &pfs_truncatable_acl, &table_events_waits_history_long::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_events_waits_summary.cc b/storage/perfschema/table_events_waits_summary.cc index 435a3500f06..05f280f8521 100644 --- a/storage/perfschema/table_events_waits_summary.cc +++ b/storage/perfschema/table_events_waits_summary.cc @@ -74,7 +74,7 @@ table_events_waits_summary_by_thread_by_event_name::m_field_def= PFS_engine_table_share table_events_waits_summary_by_thread_by_event_name::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME") }, + { C_STRING_WITH_LEN("events_waits_summary_by_thread_by_event_name") }, &pfs_truncatable_acl, &table_events_waits_summary_by_thread_by_event_name::create, NULL, /* write_row */ @@ -386,7 +386,7 @@ table_events_waits_summary_by_instance::m_field_def= PFS_engine_table_share table_events_waits_summary_by_instance::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_SUMMARY_BY_INSTANCE") }, + { C_STRING_WITH_LEN("events_waits_summary_by_instance") }, &pfs_truncatable_acl, &table_events_waits_summary_by_instance::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_ews_global_by_event_name.cc b/storage/perfschema/table_ews_global_by_event_name.cc index 35e744ed96b..c983a967c4e 100644 --- a/storage/perfschema/table_ews_global_by_event_name.cc +++ b/storage/perfschema/table_ews_global_by_event_name.cc @@ -69,7 +69,7 @@ table_ews_global_by_event_name::m_field_def= PFS_engine_table_share table_ews_global_by_event_name::m_share= { - { C_STRING_WITH_LEN("EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME") }, + { C_STRING_WITH_LEN("events_waits_summary_global_by_event_name") }, &pfs_truncatable_acl, &table_ews_global_by_event_name::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_file_instances.cc b/storage/perfschema/table_file_instances.cc index f1676421616..9ae732a0e1c 100644 --- a/storage/perfschema/table_file_instances.cc +++ b/storage/perfschema/table_file_instances.cc @@ -54,7 +54,7 @@ table_file_instances::m_field_def= PFS_engine_table_share table_file_instances::m_share= { - { C_STRING_WITH_LEN("FILE_INSTANCES") }, + { C_STRING_WITH_LEN("file_instances") }, &pfs_readonly_acl, &table_file_instances::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_file_summary.cc b/storage/perfschema/table_file_summary.cc index f8b9e66118b..a954db7ef4e 100644 --- a/storage/perfschema/table_file_summary.cc +++ b/storage/perfschema/table_file_summary.cc @@ -64,7 +64,7 @@ table_file_summary_by_event_name::m_field_def= PFS_engine_table_share table_file_summary_by_event_name::m_share= { - { C_STRING_WITH_LEN("FILE_SUMMARY_BY_EVENT_NAME") }, + { C_STRING_WITH_LEN("file_summary_by_event_name") }, &pfs_truncatable_acl, &table_file_summary_by_event_name::create, NULL, /* write_row */ @@ -227,7 +227,7 @@ table_file_summary_by_instance::m_field_def= PFS_engine_table_share table_file_summary_by_instance::m_share= { - { C_STRING_WITH_LEN("FILE_SUMMARY_BY_INSTANCE") }, + { C_STRING_WITH_LEN("file_summary_by_instance") }, &pfs_truncatable_acl, &table_file_summary_by_instance::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_performance_timers.cc b/storage/perfschema/table_performance_timers.cc index f400e37366c..acd379bc57b 100644 --- a/storage/perfschema/table_performance_timers.cc +++ b/storage/perfschema/table_performance_timers.cc @@ -58,7 +58,7 @@ table_performance_timers::m_field_def= PFS_engine_table_share table_performance_timers::m_share= { - { C_STRING_WITH_LEN("PERFORMANCE_TIMERS") }, + { C_STRING_WITH_LEN("performance_timers") }, &pfs_readonly_acl, &table_performance_timers::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_setup_consumers.cc b/storage/perfschema/table_setup_consumers.cc index 3cc6a1441c1..5b39fd89a03 100644 --- a/storage/perfschema/table_setup_consumers.cc +++ b/storage/perfschema/table_setup_consumers.cc @@ -84,7 +84,7 @@ table_setup_consumers::m_field_def= PFS_engine_table_share table_setup_consumers::m_share= { - { C_STRING_WITH_LEN("SETUP_CONSUMERS") }, + { C_STRING_WITH_LEN("setup_consumers") }, &pfs_updatable_acl, &table_setup_consumers::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_setup_instruments.cc b/storage/perfschema/table_setup_instruments.cc index 259ccee3c84..310f859248b 100644 --- a/storage/perfschema/table_setup_instruments.cc +++ b/storage/perfschema/table_setup_instruments.cc @@ -54,7 +54,7 @@ table_setup_instruments::m_field_def= PFS_engine_table_share table_setup_instruments::m_share= { - { C_STRING_WITH_LEN("SETUP_INSTRUMENTS") }, + { C_STRING_WITH_LEN("setup_instruments") }, &pfs_updatable_acl, &table_setup_instruments::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_setup_timers.cc b/storage/perfschema/table_setup_timers.cc index 8ca218913bb..24ec18dafb1 100644 --- a/storage/perfschema/table_setup_timers.cc +++ b/storage/perfschema/table_setup_timers.cc @@ -57,7 +57,7 @@ table_setup_timers::m_field_def= PFS_engine_table_share table_setup_timers::m_share= { - { C_STRING_WITH_LEN("SETUP_TIMERS") }, + { C_STRING_WITH_LEN("setup_timers") }, &pfs_updatable_acl, &table_setup_timers::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_sync_instances.cc b/storage/perfschema/table_sync_instances.cc index 82587ce493d..f2bd9fa1a28 100644 --- a/storage/perfschema/table_sync_instances.cc +++ b/storage/perfschema/table_sync_instances.cc @@ -55,7 +55,7 @@ table_mutex_instances::m_field_def= PFS_engine_table_share table_mutex_instances::m_share= { - { C_STRING_WITH_LEN("MUTEX_INSTANCES") }, + { C_STRING_WITH_LEN("mutex_instances") }, &pfs_readonly_acl, &table_mutex_instances::create, NULL, /* write_row */ @@ -223,7 +223,7 @@ table_rwlock_instances::m_field_def= PFS_engine_table_share table_rwlock_instances::m_share= { - { C_STRING_WITH_LEN("RWLOCK_INSTANCES") }, + { C_STRING_WITH_LEN("rwlock_instances") }, &pfs_readonly_acl, &table_rwlock_instances::create, NULL, /* write_row */ @@ -388,7 +388,7 @@ table_cond_instances::m_field_def= PFS_engine_table_share table_cond_instances::m_share= { - { C_STRING_WITH_LEN("COND_INSTANCES") }, + { C_STRING_WITH_LEN("cond_instances") }, &pfs_readonly_acl, &table_cond_instances::create, NULL, /* write_row */ diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc index d9aa600a21e..541ba860386 100644 --- a/storage/perfschema/table_threads.cc +++ b/storage/perfschema/table_threads.cc @@ -52,7 +52,7 @@ table_threads::m_field_def= PFS_engine_table_share table_threads::m_share= { - { C_STRING_WITH_LEN("THREADS") }, + { C_STRING_WITH_LEN("threads") }, &pfs_readonly_acl, &table_threads::create, NULL, /* write_row */ |