WL#6616 PERFORMANCE SCHEMA, INDEXES

	- Fix for CLANG compiler issue
	- Fix in table_ews_global_by_event_name::index_next()
          for global_table_lock_class, global_table_io_class

Author: mayprasa

storage/perfschema/pfs_column_types.cc

@@ -31,20 +31,20 @@ struct s_object_type_map
 
 static s_object_type_map object_type_map[]=
 {
-  { OBJECT_TYPE_EVENT, C_STRING_WITH_LEN("EVENT")},
-  { OBJECT_TYPE_FUNCTION, C_STRING_WITH_LEN("FUNCTION")},
-  { OBJECT_TYPE_PROCEDURE, C_STRING_WITH_LEN("PROCEDURE")},
-  { OBJECT_TYPE_TABLE, C_STRING_WITH_LEN("TABLE")},
-  { OBJECT_TYPE_TEMPORARY_TABLE, C_STRING_WITH_LEN("TEMPORARY TABLE")},
-  { OBJECT_TYPE_TRIGGER, C_STRING_WITH_LEN("TRIGGER")},
-  { OBJECT_TYPE_GLOBAL, C_STRING_WITH_LEN("GLOBAL")},
-  { OBJECT_TYPE_SCHEMA, C_STRING_WITH_LEN("SCHEMA")},
-  { OBJECT_TYPE_COMMIT, C_STRING_WITH_LEN("COMMIT")},
-  { OBJECT_TYPE_USER_LEVEL_LOCK, C_STRING_WITH_LEN("USER LEVEL LOCK")},
-  { OBJECT_TYPE_TABLESPACE, C_STRING_WITH_LEN("TABLESPACE")},
-  { OBJECT_TYPE_LOCKING_SERVICE, C_STRING_WITH_LEN("LOCKING SERVICE")},
-  { OBJECT_TYPE_LOCKING_SERVICE, C_STRING_WITH_LEN("ACL CACHE")},
-  { NO_OBJECT_TYPE, C_STRING_WITH_LEN("")}
+  { OBJECT_TYPE_EVENT, {C_STRING_WITH_LEN("EVENT")}},
+  { OBJECT_TYPE_FUNCTION, {C_STRING_WITH_LEN("FUNCTION")}},
+  { OBJECT_TYPE_PROCEDURE, {C_STRING_WITH_LEN("PROCEDURE")}},
+  { OBJECT_TYPE_TABLE, {C_STRING_WITH_LEN("TABLE")}},
+  { OBJECT_TYPE_TEMPORARY_TABLE, {C_STRING_WITH_LEN("TEMPORARY TABLE")}},
+  { OBJECT_TYPE_TRIGGER, {C_STRING_WITH_LEN("TRIGGER")}},
+  { OBJECT_TYPE_GLOBAL, {C_STRING_WITH_LEN("GLOBAL")}},
+  { OBJECT_TYPE_SCHEMA, {C_STRING_WITH_LEN("SCHEMA")}},
+  { OBJECT_TYPE_COMMIT, {C_STRING_WITH_LEN("COMMIT")}},
+  { OBJECT_TYPE_USER_LEVEL_LOCK, {C_STRING_WITH_LEN("USER LEVEL LOCK")}},
+  { OBJECT_TYPE_TABLESPACE, {C_STRING_WITH_LEN("TABLESPACE")}},
+  { OBJECT_TYPE_LOCKING_SERVICE, {C_STRING_WITH_LEN("LOCKING SERVICE")}},
+  { OBJECT_TYPE_LOCKING_SERVICE, {C_STRING_WITH_LEN("ACL CACHE")}},
+  { NO_OBJECT_TYPE, {C_STRING_WITH_LEN("")}}
 };
 
 void object_type_to_string(enum_object_type object_type,

storage/perfschema/table_ews_global_by_event_name.cc

@@ -340,6 +340,7 @@ int table_ews_global_by_event_name::index_next(void)
   PFS_rwlock_class *rwlock_class;
   PFS_cond_class *cond_class;
   PFS_file_class *file_class;
+  PFS_instr_class *table_class;
   PFS_socket_class *socket_class;
   PFS_instr_class *instr_class;
 
@@ -420,27 +421,18 @@ int table_ews_global_by_event_name::index_next(void)
     case pos_ews_global_by_event_name::VIEW_TABLE:
       do
       {
-        if (m_pos.m_index_2 == 1)
+        table_class= find_table_class(m_pos.m_index_2);
+        if (table_class)
         {
-          if (m_opened_index->match(&global_table_io_class))
+          if (m_opened_index->match(table_class))
           {
-            make_table_io_row(&global_table_io_class);
+            make_table_io_row(table_class);
             m_next_pos.set_after(&m_pos);
             return 0;
           }
           m_pos.set_after(&m_pos);
         }
-        if (m_pos.m_index_2 == 2)
-        {
-          if (m_opened_index->match(&global_table_lock_class))
-          {
-            make_table_lock_row(&global_table_lock_class);
-            m_next_pos.set_after(&m_pos);
-            return 0;
-          }
-          m_pos.set_after(&m_pos);
-        }
-      } while (rwlock_class != NULL);
+      } while (table_class != NULL);
       break;
     case pos_ews_global_by_event_name::VIEW_SOCKET:
       do
@@ -652,4 +644,4 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
   }
 
   return 0;
-}
+}