Misc merge cleanup for the socket instrumentation.

Author: marcalff

storage/perfschema/pfs_instr_class.cc

@@ -1024,7 +1024,6 @@ PFS_socket_key register_socket_class(const char *name, uint name_length,
   {
     entry= &socket_class_array[index];
     init_instr_class(entry, name, name_length, flags, PFS_CLASS_SOCKET);
-    entry->m_index= index;
     entry->m_event_name_index= socket_class_start + index;
     entry->m_singleton= NULL;
     PFS_atomic::add_u32(&socket_class_allocated_count, 1);

storage/perfschema/pfs_instr_class.h

@@ -340,8 +340,6 @@ struct PFS_socket_class : public PFS_instr_class
 {
   /** Socket usage statistics. */
   PFS_socket_stat m_socket_stat;
-  /** Self index in @c socket_class_array. */
-  uint m_index;
   /** Singleton instance. */
   PFS_socket *m_singleton;
 };

storage/perfschema/table_setup_instruments.cc

@@ -170,7 +170,7 @@ int table_setup_instruments::rnd_pos(const void *pos)
     instr_class= find_statement_class(m_pos.m_index_2);
     break;
   case pos_setup_instruments::VIEW_SOCKET:
-    instr_class= find_table_class(m_pos.m_index_2);
+    instr_class= find_socket_class(m_pos.m_index_2);
     break;
   case pos_setup_instruments::VIEW_IDLE:
     instr_class= find_idle_class(m_pos.m_index_2);