List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:April 20 2011 3:31am
Subject:bzr push into mysql-trunk branch (chris.powers:3283 to 3284) WL#4896
View as plain text  
 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
 {


Attachment: [text/bzr-bundle] bzr/cpowers@tma-1-20110420033016-o9a86q9tt39gd6xf.bundle
Thread
bzr push into mysql-trunk branch (chris.powers:3283 to 3284) WL#4896Christopher Powers20 Apr