From: Christopher Powers
Date: February 4 2011 7:35am
Subject: bzr push into mysql-trunk-wl5379 branch (chris.powers:3222 to 3223)
List-Archive: http://lists.mysql.com/commits/130357
Message-Id: <20110204073542.EDE3C1DB0333@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2627473476766100800=="

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

 3223 Christopher Powers	2011-02-04
      merge

    modified:
      include/mysql/psi/mysql_socket.h*
      include/mysql/psi/psi.h*
      storage/perfschema/CMakeLists.txt*
      storage/perfschema/pfs.cc*
      storage/perfschema/pfs_column_types.h*
      storage/perfschema/pfs_engine_table.cc*
      storage/perfschema/pfs_events_waits.h*
      storage/perfschema/pfs_instr.cc*
      storage/perfschema/pfs_instr.h*
      storage/perfschema/pfs_instr_class.cc*
      storage/perfschema/pfs_instr_class.h*
      storage/perfschema/pfs_stat.h*
      storage/perfschema/table_events_waits.cc*
      storage/perfschema/table_events_waits_summary.cc*
      storage/perfschema/table_socket_instances.cc*
      storage/perfschema/table_socket_instances.h*
 3222 Christopher Powers	2011-02-02
      WL#4896 "Performance Schema Net IO"
      
      - Updated abi files
      - Fixed compiler warnings
      - Updates to table definition of socket_instances

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
      storage/perfschema/pfs.cc
      storage/perfschema/table_socket_instances.cc*
      storage/perfschema/table_socket_instances.h*
=== modified file 'include/mysql/psi/mysql_socket.h' (properties changed: +x to -x)
=== modified file 'include/mysql/psi/psi.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/CMakeLists.txt' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_column_types.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_engine_table.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_events_waits.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr_class.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_instr_class.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/pfs_stat.h' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_events_waits.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_events_waits_summary.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_socket_instances.cc' (properties changed: +x to -x)
=== modified file 'storage/perfschema/table_socket_instances.h' (properties changed: +x to -x)

--===============2627473476766100800==
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: c9b1d12c37fc9400012aff50dc43071b4e961515
# timestamp: 2011-02-04 01:35:42 -0600
# source_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\
#   wl5379/
# base_revision_id: chris.powers@stripped\
#   pw8ylc67ke9la3sg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaAkdEwACb5fgEAQUGP/91oG
QAC////wYAsd1X1VQoAAAoCEAAoAClAGAAGgADJoAAA0BgABoAAyaAAANANTCanpQaAAAAABoAJN
REmkZpMjRT9SaZADQyNqAGAAGgADJoAAA0AVKQAEyCaNNBATRiT1E09Tym84cEVBZwfOE+N3y6c9
1Zxda6Y6YrONMExvlApm8XZjg7KRlbWutUACFMAB0JwUiSTUlWZTjWAPtAO8AZGERiHx+Ehn1zT0
dXbFHewEyz33ixQDRnR5jBvJEIITExGVFHAADr95WgAIsADid3ps+d7YMZrltpVunLN554zW/Ndf
kK9WlopLAxvCrGvD86W8679P5zqt5fSRLqSQe2VcPnS6w+apA9hzP3JEsTxKKEQT6RKEYSRKLqJg
oYKOeSQ5z1z8DkQ08k75+mJoHe+Bozr7aoooKAkeF1OdpQWJYMhJ0Da+8Nwyb7VduffKSG9IUpEw
wuld60sKQCUYLDS6CQ8hkhKJAyESiQ85clkhLFTs7yVrNXZwawyklzw9P2xf8ZwvIZLrrFzlirhs
zVJRWpbbNtVM0tVELKWv+csGmlzikMsrixDGUby5osatXJexZWlq/BRljYote6jd+0N//SF1edVX
WRefCy1dpnTFQB7r6d3HUEkBJyEomQ6ZqQlnVuwXezHk9c352Z1xJG215Rnqyz3Xs0YZbJDOTKku
cKsM+LrVhrdy5WVdeOmWO8Xle3Lm0VVQNvJC3CC9ekMH/fDgxZaOrk2x1qWGzAh1t5dF7Z9/Bya3
vj8b/MolybniHFsozZu61/aQsXuh1cXWx6lEeNl/W/Oo4L6779KFSyqqSEqSG8hKJfjZSxVeqdGF
m61irVmd7xUO6kyXsWFimEsK6khU01WLl7W6c1/rUsqqVzFZktvbNleatVq4ZPg667OLdd0ZuLxs
kLTzYaLl6lixibLWT+mZnGfHnjBXK67CuYw5e9Uk2UcGDo4M7eDzcnBWv8GCzClq4haueOxjtXq0
cLNGR4rlrjXq0V2tWDZTDRg0U6ODhysZvwvXpryo3z5VK+NKdarqBxpjC9IVQcnFMm/wvIb2L0NG
LLk6LbJW3VwX76c+C651xddmy5fekOfXY0qxYuBxVMGKpnix4e+iy9fk56OTThTWCtU2Vr1qtu8W
q9osfKFfc0WXVda42kdGavipczYbMemS4hWuvbrrmdEzdZk5KnLpIV5fXdkruUcnHNSpuxYNyNZY
8ljkvYNFbJuo1PnJDMhuQ8+HTO/nVXkzr4V4V8K8b+nbU2clzQ6TZIWLmTnz1tdFu2Wuc7aY27r3
Bm3y5ODsnCvG2tyX3vDihzbKmTgo5rWlxWtcH1SBjy26ee/YdNOPlYQEFrBdXWKNSJRqWeWhUQrX
NF5RbUrUVrOjfZassXqmFGe042oVNGq5cwWxox1UYtGrNxUVua7BOu6quluX1NrN5luuYMJYxXLr
8L2jFRfe5MGrNiwvYsOC1gteFOWTFxo57Llq5kxbObVfxxYppS2Wrmke0N0ha/tKVUpxtSkucm1x
cc8r27Bw60WblehkzYrO1NVumjF9eJjYclDEX+DE1dHFqmrNuvaNTFa34amiVzlMaXUBdz3hDWg6
b3TOtwDGbIDudIBrIGdXw/SAbp7OFMiiqojE9wByKC6kiqqqqqsUVRO3yAPh7QJMAG8kURPXT34P
Xj95NSYjGcU2JGAjBJYSpAfuorB6SxKyktlUNUm74sEHJ6vB1ejrW0ap6MvQvd2qiipi83qcGr0V
MVVyjJayf5U4PCSezRo/PkJK22DVuytLfT0vdsZD5Q/ru/HqHKS7txkF3mlLZTnKfTo7Olrd2WrP
V4r3dRa7uz1Xs3qsYO7VY1XLG8rassGLJRUyaNGajmxUXr2Kj6lkk7/OJNZMcRKk+qjsVpPdmu8H
F751tGzq6qnZLXNcyo5rLFi9o4ySxko+/FxdWSv1+CTjIfs5wUCr/vK78Q/tKxJ8IX4WTiJMf1DX
bo/CQ9Hdq9eV97y93sv34ebuxd1bxvVOyGbz1pKaNkOC7LhwvaQOEejThSk6OTJve1qXbsWC584P
h/J8Jw9qg20qkQwbvBbb/r5Knh4XsH0dXZY6qaMe6zrNaT1VSlUp2dm62p+5D9GrFcaPN0VM0+4f
QNQu+1VVvkkbSFE95yZvxy9JzOp52bvQ+syabcdcU+PYz1OXa7X+aPE5kn4z9YD/CUQr799Tz+iT
0/b3hJX2UnztcIcIayGMCzp5ur1V+ixxdHm2XK7nouVvV2wU9WipRWxXqzhOqtg4Pl8tmCjZnifG
DrB9w+wf6D5UZ95E7JKu8esciLKr52n3SOPjS1BjUky8UhzcywSfr8T5JDlEyetJjwIU3b4fCBSz
0g8glT94ePjIfacMUP68/GzeQ/8NxJ9pCn9/h+6Q94fvgFnZ7T/ZDyOU/JekPbvT3h+OU+SbS2Ht
6nnIfg/B+vmeO0h8yHjYWz8pon6SqfwGcsElQVJQKJc29+10MuxD9T+FBJgkte3wn5hmHzcFumNJ
bbBbCn8/7pXceZSDCfwGElqRZTWbZ1oVwfQpKqSJSex+P07w5cySXPypB8rHx/sSUkMZ+9U3/ysS
dOnlQKIKgHoSae+V2RRRRRRRRb7TX+AJPLG6X07JY9YcT9vE4Q8/TmlUlE3kQ+Fkg4fDpBeH7e8J
MJjX07lyJLfWF1TOm+Cx5u7wljRaJRvAkqe4NwEmkIXGJDNEl23xSkOtBkHCM5CoPskMkO9cPQ3T
N+6WTDKQrJVK67fjLarqKPikKqwrSwF09vZSilKUnJF8t18gevacEhd5eO7YzIpKEp4XpXLapZIl
MSFcPebzUh+j6dfsQ76ZTKr+Ws8STzd04Q/gh0hJ9kh03If8SGRzhYpM4HA+8LDVLZ9Tt5QWYeaQ
//F3JFOFCQoCR0TA


--===============2627473476766100800==--