From: Christopher Powers
Date: February 8 2011 7:40pm
Subject: bzr push into mysql-trunk-wl5379 branch (chris.powers:3225 to 3226) WL#4896
List-Archive: http://lists.mysql.com/commits/130776
Message-Id: <20110208194008.BF8011DB0333@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5271075017287670914=="

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

 3226 Christopher Powers	2011-02-08
      WL#4896 "Performance Schema Net IO"
      
      - Add socket_summary_by_instance to CMakeLists.txt

    modified:
      storage/perfschema/CMakeLists.txt
 3225 Christopher Powers	2011-02-07
      WL#4896 "Performance Schema Net IO"
      
      - Fixed warning in pfs.cc
      - Updated abi_check.out files

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
      storage/perfschema/pfs.cc
=== modified file 'storage/perfschema/CMakeLists.txt'
--- a/storage/perfschema/CMakeLists.txt	2011-01-26 23:02:25 +0000
+++ b/storage/perfschema/CMakeLists.txt	2011-02-08 19:39:54 +0000
@@ -51,6 +51,7 @@ table_ews_global_by_event_name.h
 table_file_instances.h
 table_file_summary.h
 table_socket_instances.h
+table_socket_summary_by_instance.h
 table_helper.h
 table_os_global_by_type.h
 table_performance_timers.h
@@ -88,6 +89,7 @@ table_ews_global_by_event_name.cc
 table_file_instances.cc
 table_file_summary.cc
 table_socket_instances.cc
+table_socket_summary_by_instance.cc
 table_helper.cc
 table_os_global_by_type.cc
 table_performance_timers.cc


--===============5271075017287670914==
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: a0d4f69b4695287bac166fb309e88cec91798570
# timestamp: 2011-02-08 13:40:08 -0600
# base_revision_id: chris.powers@stripped\
#   e0cq6pg99bw2z57u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcJt95sAAXpfgAAQWGP/93on
yIC////wUANy0vcbg5bdnBJIQTTNKepsm1NIeqZ6kzSZGg0ZpHpBkSYQJ4kZRpo0Bk0PUNMg0AEk
jSNJo1PQmT1GamgAYgNAAOYAAAAAAAAAAEkiEjxqehQNPU/SQB6QABkNPUWeGOxd8pjNOq4LHLQQ
HPW9kEYsAiZLKkRDv8wOFDq7AwVoKGLwwlDHhtEfX93MahVA3x6LJ1yjPdqKppQjFeffksNZ6iMs
kFwb5vlu9d+ymSFikrqqYX90pxOaTMpapIVac4YqCCb6XWRhXRW8qVhKCtVVSMKWq91DvZBeV465
0LxhNOoUNc1mSpHr2p0C8OnXw36SFRMVvtt5LZAwaTsWQtS50DuZVp+WtlDGh+W59zByXElSzQU9
Fmm16X+XSmTpyRZhTUq1exfY8Vi4Mwtd86LWpIGd6gTEn3GA0RVBGrRkuM30bosCwsmP13JARutN
OWUiwNUZLaV/DrNthuchVz66S20ASLxZQDVUS8MvgGPFK6XFt9oSuBNWawG6IdAOOQOpOgxFDTIa
dFInXKZRk4EU4SRzlDHsKPRogA16R2C+NKasFDH49vYkYJGBhj1pfNKH3A9iPvRAo2Kym2KgGHa5
EZRHhkX4mk61C+vBIqOzqFIjMHsWnldW9lN3Vogjxbur6mbs0J+bW4vKBx10UtDGxbpL/KvrRqUV
QKTq/pgEOUz8eWVofM6xncbKP4nJE09iRRJRM9v3V8ZEblImTDrYLI/r8zymv3vYZIZoxW5zenme
dph39tV2LaOqIagYr4W7PR2lUbm7NVIpbLZ2n4uOYicD4TJ2e234lzawTvHlkZZ1APOpT2Ov4jSf
IxIrO7rqlBxi5oCuVaMdUThDM4otTkj2xkohXQQI0eSabA4E4u0BTQuWF0OcLEjMG9+A2a6Z4Y+D
1LBuPQDlcFYuO4LKgwxDZqqSG7mYcry657UiRMxZUynnrHqU5SUohfMh4PbTQ5UoZkywwtVcAU4a
nk+SQwZgvU2dzCROU0QqNrsSnW/WSMsJm7wBzYIaiTnYQ/PIoV/UC3CqDM9tCE7ssCufiSJBFIbe
ulYaGrmDblNZ7XMtRzKdQMElCyXkqONPCI6uzmMKJFmIzxip8MLSipEQvcEz1TkF8ljQqGypV4ZK
ILRWdCmvTJqhULIXT4CzeLtF7qW017l/xdyRThQkMJt95sA=


--===============5271075017287670914==--