From: Christopher Powers
Date: March 19 2011 1:46am
Subject: bzr commit into mysql-trunk branch (chris.powers:3265) WL#4896
List-Archive: http://lists.mysql.com/commits/133371
Message-Id: <20110319014652.06B151DB0335@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6484504536907720055=="

--===============6484504536907720055==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:cpowers@tma-1-20110319014219-hua2dkcxl5mnayke

 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
=== 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
 {


--===============6484504536907720055==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/chris.powers@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: b46317aad1ec14c05e5240d3f1b0c48a97196066
# timestamp: 2011-03-18 20:46:51 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110319014219-hua2dkcxl5mnayke
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc6r75QAAiPfgAAQWGf/934t
zYC////wUAQ68yVB7OkLdkCShTJoT0yeoT0yBM1NPQmjIwQaDQcwCaYBMhgACYJgAAAkkCZNGpk9
TVNPU0MaIBoAAAAxVNqGQaaBo9QA0aAAAAAJKFPIJgJNpkYpqGho3oSNMhp4oDtdeZbj5/E2jvjY
YxenRs+AK99oQwKSe5gaFj0kxiYMOfBXOkFfGEBQ6GAwsKzBg3pFuwzh04L368rpAxB4crqtmHM1
mjtMcdoOsaI5NkjMoFqwUwcyCYA8N1IDFlupFV+r49vZLvwSJKEwyESi1lE0RMdr0idHdzjAVmQo
70jd4SQnwQpQl0wICxByoeHzYEo/XZ1lkwchhl+1jjJCmam7v6ZoWQoRe63HhWouWpmQSJrAIzLT
swLIXUHha5xd7/2KdPSLbCs0nMu6gdRYmxhulKpxYptiQPeOxI1sE+gWUqVr9qXRPgPOC5WzjnNJ
kLAdPKvdePSjhXfPjkY4UNOt4RIloaGN5ZpMFSTuAiAmKAJSY4yNIGre2DOXVGpo2RgSg1NxkY78
cVdwwYZQOzAcNo4zXKFLEE1tKqnPq7c+YEr1xFq1ZmAjbLUIZEx136mM87mpF48LG45p6FbD36Aa
QDhz6gX0bMmN03LXIjRJvKvMrkCOhEXVE1eJOrwFwnwltUYpNxR3QBS+BY7k4AZ75Oazs8h7J/Nm
0sJvUIvBptIyiJLqnRnkA7bfEYhYg4kru0ZG4CD6HgCeHgkEp+Aeh3cjidCL1CUOkxa4cHqHXmP0
vBqNbOqJAG6ApCQrCMqaDQmDyFt3FaVvFwPFeDhZrRlPPWO/r4qePqkSapXI3yvHvg2tspMKmQr0
nrGwfJrHEov4KLvSnjLfQDMm4TeMQ0Z46CuTGl5ot7quR3pg3rHBiR54JDwaBq81fUV7MvKyewLS
ANcjK8kzUXYFGq/S1xSUvKJvXMXOzSc5dR4FiqBNjI0a5Cg7YYnSOZJNZrTssfbS1UvhMBt59vfk
mEsWGY62kRIdqKu95TgyGPyYp7aqNBwMdxpGZRdwFIpdIs73UCibPsE0Rv1qVFMRiGCwCeXa+5DI
c6nE02zTIj/Z7zpEXxUiPghmfteZUAagN+e3WLa9rZLV0UgrkXimRvBbIFkCAxofixgEQfJCAciF
8mwtzISQ7AW2kXh2Js2HrUYhCCOokokEQbu+MDPJdomUWBl2Z70JyM3FX+SGIgGpqn4OSCquxgwK
XKB9AIeAilMFCLNfVgxlIuOHZcxTgG9wEmFagey9IjDW/fxFJJRiytARm5Cg6NTnYoUAmhxgdbHX
5KEpi0f4oPccgzZ9NQ5P11qd4DEXQqicF5ODPtFhsr9OG7HYWKujjoJWyUEUWq6G0UP+LuSKcKEh
nVffKA==


--===============6484504536907720055==--