From: Christopher Powers
Date: April 20 2011 3:31am
Subject: bzr push into mysql-trunk branch (chris.powers:3283 to 3284) WL#4896
List-Archive: http://lists.mysql.com/commits/135753
Message-Id: <20110420033135.DB3181DB033A@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7868509192778645446=="

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

 3284 cpowers	2011-04-19
      WL#4896 "Performance Schema Net IO"
      
      Remove debugging code

    modified:
      storage/perfschema/pfs_stat.h
 3283 cpowers	2011-04-19
      WL#4896 "Performance Schema Net IO"
      
      - Fixed socket version bug
      - Windows: Replaced inet_ntop() with getnameinfo()
      - Use #define HAVE_IPV6
      - Removed redundant includes of arpa/inet.h and winsock2.h
      - Streamlined aggregate() methods in pfs_stat.h
      - Deleted unused set() methods in table_helper.h

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_global.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/table_helper.h
=== modified file 'storage/perfschema/pfs_stat.h'
--- a/storage/perfschema/pfs_stat.h	2011-04-19 19:46:36 +0000
+++ b/storage/perfschema/pfs_stat.h	2011-04-20 03:30:16 +0000
@@ -87,60 +87,6 @@ struct PFS_single_stat
   }
 };
 
-/** Single statistic. */
-struct PFS_single_stat_test
-{
-  /** Count of values. */
-  ulonglong m_count;
-  /** Sum of values. */
-  ulonglong m_sum;
-  /** Minimum value. */
-  ulonglong m_min;
-  /** Maximum value. */
-  ulonglong m_max;
-
-  PFS_single_stat_test()
-  {
-    m_count= 0;
-    m_sum= 0;
-    m_min= ULONGLONG_MAX;
-    m_max= 0;
-  }
-
-  inline void reset(void)
-  {
-    m_count= 0;
-    m_sum= 0;
-    m_min= ULONGLONG_MAX;
-    m_max= 0;
-  }
-
-  inline void aggregate(const PFS_single_stat *stat)
-  {
-    m_count+= stat->m_count;
-    m_sum+= stat->m_sum;
-    if (unlikely(m_min > stat->m_min))
-      m_min= stat->m_min;
-    if (unlikely(m_max < stat->m_max))
-      m_max= stat->m_max;
-  }
-
-  inline void aggregate_counted(ulonglong count)
-  {
-    m_count+= count;
-  }
-
-  inline void aggregate_value(ulonglong value)
-  {
-    m_count++;
-    m_sum+= value;
-    if (unlikely(m_min > value))
-      m_min= value;
-    if (unlikely(m_max < value))
-      m_max= value;
-  }
-};
-
 /** Combined statistic. */
 struct PFS_byte_stat : public PFS_single_stat
 {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cpowers@tma-1-20110420033016-o9a86q9tt39gd6xf
# target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\
#   wl4896/
# testament_sha1: 315ba7a9ef1cc025de2428973318d71c52355ae3
# timestamp: 2011-04-19 22:31:35 -0500
# source_branch: bzr+ssh://cpowers@stripped/bzrroot\
#   /server/mysql-trunk/
# base_revision_id: cpowers@tma-1-20110419194636-kpp0yk748dsjz8i1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUVXYwAAAXNfgAAQWGP/93In
3IC////wQAMa4OnduxgBKTSaTCNqNTDICeU2keoyAeoaPU0DSIJ+onqeFNMQNAAAAAaAanpJpoRp
oaZAaAA0ANAACSQEBpU96KeQp5Jk1PBMkGA0jaRIpRRsEblSIV4VwASECNEatEDac7So0cB4W6CS
YEk5u5efow9+ns/7Yhymz3K+iLgLrUTitlE4hotXCYRBxzXHb2hJhdH32zhJZWT359xEVGq5PFyv
chMnuTxbPXe+IqkBDt6yzUFooD4w9AxRgP7kjlJeMlERsXccZoT4RVkIXaXeZksJql7hWeOVOPVc
SqHYFSFnqtFwYhPZhSQpq0/GSHYUWcplthrOIQLuLhP6MHDC44Bjvp0ifjLg1hmOirlSIWsJ9mG8
HUgpgNUDgHw0VIXLlW+20cYgIMRRXOrEloCyKaFBkRyO3KIxbcLoTxWrn7QiSNLZqZiWTlTDQVSe
o/cXWXyMGLpB+w0WMWYBsJOLyw+AryFkhf8LHCEb6zXlBgldLYUC3FqLxYHwGPmrOJLWSxSKzj3O
a1KHN19iMPVZefNbpcDbrH45EMXFoqXgmreOSwZTBQI6ooK/PnyMiniHlWtYYXIfBMd2fvMuyo4z
79N2zcQ61qRujEDEUnwwmX3PM9Q0eEAZRgCEsrbiYLCn3oVKYwpx1BRo1yTRbYy0eT+GcduMASOx
9ORr2MJ+yp+YrWKELI6Z5cVYscGlrIGlOKGJlf0phL+BlRiST5b6ev+BF00n7IEaN+ENtGQt0mgh
lO2yvVMpvyI1YNwj0LarkeaAiUzJsVDR/amahTw9U0ek2TjT7Bfu9dt0Kh1h7l0v8GS1q3oGYZh+
NgmF1rw6VypyjHUQ3AJVsN3lKMVGAb4DwexlfND2TLhAWd7QDteYhIOpyuo8AbGjMnHxi38tLAFz
D2WeYtc81eHk9EtciS4TDc6kEKEGWYJ2awaNxq1uoN1rrC1NysIqaPY/m5TFxTn9pQGjU5UU61wP
kIuC8Kxcu4VtduiVl9iqDgX7V/BBBTX9B1SDdQl3r/xdyRThQkEVXYwA


--===============7868509192778645446==--