diff options
| author | unknown <timour@askmonty.org> | 2013-06-27 12:51:34 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2013-06-27 12:51:34 +0300 |
| commit | ecbf36a914b696b01ae1497567025e239f4ea693 (patch) | |
| tree | 4601dad5ca6d178a6efedfe79d1ef56a9ab257f8 /storage | |
| parent | 68262ba648886e2d5f35fc85e3cc45df7ffd9ae5 (diff) | |
| download | mariadb-git-ecbf36a914b696b01ae1497567025e239f4ea693.tar.gz | |
MDEV-4058
MySQL 5.6.10 performance schema: merge of host_cache table
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/pfs_engine_table.cc | 8 | ||||
| -rw-r--r-- | storage/perfschema/table_host_cache.cc | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc index 8f6f0fa3bcd..8854ee6f173 100644 --- a/storage/perfschema/pfs_engine_table.cc +++ b/storage/perfschema/pfs_engine_table.cc @@ -105,9 +105,7 @@ static PFS_engine_table_share *all_shares[]= &table_file_instances::m_share, &table_file_summary_by_event_name::m_share, &table_file_summary_by_instance::m_share, -#ifdef QQ_NOT_YET &table_host_cache::m_share, -#endif &table_mutex_instances::m_share, &table_os_global_by_type::m_share, &table_performance_timers::m_share, @@ -164,7 +162,7 @@ void PFS_engine_table_share::check_all_tables(THD *thd) DBUG_EXECUTE_IF("tampered_perfschema_table1", { /* Hack SETUP_INSTRUMENT, incompatible change. */ - all_shares[19]->m_field_def->count++; + all_shares[20]->m_field_def->count++; }); for (current= &all_shares[0]; (*current) != NULL; current++) @@ -1412,11 +1410,7 @@ bool pfs_show_status(handlerton *hton, THD *thd, - no host_cache.memory */ name= "host_cache.size"; -#ifdef NOT_YET_IMPLEMENTED size= sizeof(Host_entry); -#else - size= 0; -#endif break; /* diff --git a/storage/perfschema/table_host_cache.cc b/storage/perfschema/table_host_cache.cc index 9c44a1fe235..02c7f72140a 100644 --- a/storage/perfschema/table_host_cache.cc +++ b/storage/perfschema/table_host_cache.cc @@ -23,8 +23,6 @@ #include "table_host_cache.h" #include "hostname.h" -#ifdef NOT_YET_PORTED - THR_LOCK table_host_cache::m_table_lock; static const TABLE_FIELD_TYPE field_types[]= @@ -478,4 +476,3 @@ int table_host_cache::read_row_values(TABLE *table, return 0; } -#endif /* NOT_YET_PORTED */ |