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

[Christopher Powers]

 3265 Christopher Powers	2011-03-18
      WL#4896 "Performance Schema Net IO"
      
      - PSI update

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
 3264 cpowers	2011-03-18 [merge]
      merge

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-03-18 23:41:39 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-03-19 01:46:46 +0000
@@ -70,8 +70,8 @@ enum PSI_table_lock_operation
 };
 enum PSI_socket_state
 {
-  PSI_SOCKET_STATE_IDLE= 0,
-  PSI_SOCKET_STATE_ACTIVE= 1
+  PSI_SOCKET_STATE_IDLE= 1,
+  PSI_SOCKET_STATE_ACTIVE= 2
 };
 enum PSI_socket_operation
 {

=== modified file 'include/mysql/psi/psi_abi_v2.h.pp'
--- a/include/mysql/psi/psi_abi_v2.h.pp	2011-03-16 15:36:35 +0000
+++ b/include/mysql/psi/psi_abi_v2.h.pp	2011-03-19 01:46:46 +0000
@@ -70,8 +70,8 @@ enum PSI_table_lock_operation
 };
 enum PSI_socket_state
 {
-  PSI_SOCKET_STATE_IDLE= 0,
-  PSI_SOCKET_STATE_ACTIVE= 1
+  PSI_SOCKET_STATE_IDLE= 1,
+  PSI_SOCKET_STATE_ACTIVE= 2
 };
 enum PSI_socket_operation
 {


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