bzr push into mysql-trunk branch (marc.alff:3513 to 3514)

[Marc Alff]

 3514 Marc Alff	2011-10-19
      Misc merge cleanup for the socket instrumentation.

    modified:
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/table_setup_instruments.cc
 3513 Joerg Bruehe	2011-10-19 [merge]
      Upmerge 5.5.17 stuff into 5.6.

    modified:
      man/CMakeLists.txt
      support-files/mysql.spec.sh
=== modified file 'storage/perfschema/pfs_instr_class.cc'
--- a/storage/perfschema/pfs_instr_class.cc	2011-08-25 07:53:21 +0000
+++ b/storage/perfschema/pfs_instr_class.cc	2011-10-19 17:56:04 +0000
@@ -1024,7 +1024,6 @@ PFS_socket_key register_socket_class(con
   {
     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);

=== modified file 'storage/perfschema/pfs_instr_class.h'
--- a/storage/perfschema/pfs_instr_class.h	2011-08-11 03:11:58 +0000
+++ b/storage/perfschema/pfs_instr_class.h	2011-10-19 17:56:04 +0000
@@ -340,8 +340,6 @@ struct PFS_socket_class : public PFS_ins
 {
   /** 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;
 };

=== modified file 'storage/perfschema/table_setup_instruments.cc'
--- a/storage/perfschema/table_setup_instruments.cc	2011-07-16 19:25:42 +0000
+++ b/storage/perfschema/table_setup_instruments.cc	2011-10-19 17:56:04 +0000
@@ -170,7 +170,7 @@ int table_setup_instruments::rnd_pos(con
     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);

No bundle (reason: useless for push emails).