bzr push into mysql-trunk branch (chris.powers:3255 to 3256) WL#4896

[Christopher Powers]

 3256 Christopher Powers	2011-03-14
      WL#4896 "Performance Schema Net IO"
      
      - API change: Updated ps_abi_v1.h.pp

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
 3255 cpowers	2011-03-14
      WL#4896 "Performance Schema Net IO"
      
      - Replaced get_thread_id() API with set_socket_owner()
      - Replaced PFS_socket.m_thread_id with m_thread_owner
      - SOCKET_INSTANCES.THREAD_ID displays owning thread id if availble, else NULL  

    modified:
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/psi.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/table_socket_instances.cc
=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-03-09 23:28:32 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-03-14 16:29:27 +0000
@@ -225,7 +225,7 @@ typedef struct PSI_cond* (*init_cond_v1_
   (PSI_cond_key key, const void *identity);
 typedef void (*destroy_cond_v1_t)(struct PSI_cond *cond);
 typedef struct PSI_socket* (*init_socket_v1_t)
-  (PSI_socket_key key, const void *identity);
+  (PSI_socket_key key, const my_socket *fd);
 typedef void (*destroy_socket_v1_t)(struct PSI_socket *socket);
 typedef struct PSI_table_share* (*get_table_share_v1_t)
   (my_bool temporary, struct TABLE_SHARE *share);
@@ -343,6 +343,8 @@ typedef void (*set_socket_info_v1_t)(str
                                      my_socket *fd,
                                      const struct sockaddr *addr,
                                      socklen_t *addr_len);
+typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket,
+                                             struct PSI_thread *thread);
 struct PSI_v1
 {
   register_mutex_v1_t register_mutex;
@@ -415,6 +417,7 @@ struct PSI_v1
   set_socket_descriptor_v1_t set_socket_descriptor;
   set_socket_address_v1_t set_socket_address;
   set_socket_info_v1_t set_socket_info;
+  set_socket_thread_owner_v1_t set_socket_thread_owner;
 };
 typedef struct PSI_v1 PSI;
 typedef struct PSI_mutex_info_v1 PSI_mutex_info;


Attachment: [text/bzr-bundle] bzr/[e-mail]