List:Commits« Previous MessageNext Message »
From:Mayank Prasad Date:February 6 2012 6:47am
Subject:bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3429 to 3430) WL#5767
View as plain text  
 3430 Mayank Prasad	2012-02-06
      WL#5767 : Performance Schema, Statements Digest	
      
      Details:
       - Probable fix for a failing test case on PB2.

    modified:
      storage/perfschema/pfs_digest.cc
 3429 Mayank Prasad	2012-02-06 [merge]
      WL#5767 : Performance Schema, Statements Digest
      
      Details:
       - Merge mysql-trunk -> mysql-trunk-wl5767

    removed:
      include/byteorder/
    added:
      mysql-test/r/eq_range_idx_stat.result
      mysql-test/t/eq_range_idx_stat.test
    renamed:
      include/byteorder/big_endian.h => include/big_endian.h
      include/byteorder/byte_order_generic.h => include/byte_order_generic.h
      include/byteorder/byte_order_generic_x86.h => include/byte_order_generic_x86.h
      include/byteorder/byte_order_generic_x86_64.h => include/byte_order_generic_x86_64.h
      include/byteorder/little_endian.h => include/little_endian.h
    modified:
      include/CMakeLists.txt
      include/my_byteorder.h
      include/myisam.h
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/include/have_32bit.inc
      mysql-test/include/icp_tests.inc
      mysql-test/include/order_by.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/myisam.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/type_temporal_fractional.result
      mysql-test/suite/engines/funcs/r/date_function.result
      mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
      mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/opt_trace/r/eq_range_statistics.result
      mysql-test/suite/opt_trace/t/eq_range_statistics.test
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      mysql-test/t/myisam.test
      mysql-test/t/optimizer_debug_sync.test
      mysql-test/t/type_temporal_fractional.test
      sql/handler.cc
      sql/opt_range.cc
      sql/sql_select.cc
      sql/sql_time.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0dblwr.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/univ.i
      storage/innobase/lock/lock0lock.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/srv/srv0mon.cc
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_check.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamdef.h
      storage/myisam/sort.c
=== modified file 'storage/perfschema/pfs_digest.cc'
--- a/storage/perfschema/pfs_digest.cc	2012-02-04 19:02:49 +0000
+++ b/storage/perfschema/pfs_digest.cc	2012-02-06 06:46:14 +0000
@@ -80,7 +80,12 @@ int init_digest(unsigned int statements_
                      MYF(MY_ZEROFILL));
    
   for (index= 0; index < statements_digest_size; index++)
-  statements_digest_stat_array[index].m_stat.reset();
+  {
+    statements_digest_stat_array[index].m_digest_storage.reset();
+    statements_digest_stat_array[index].m_stat.reset();
+    statements_digest_stat_array[index].m_first_seen= 0;
+    statements_digest_stat_array[index].m_last_seen= 0;
+  }
 
   return (statements_digest_stat_array ? 0 : 1);
 }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3429 to 3430) WL#5767Mayank Prasad6 Feb