List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 9 2011 10:59am
Subject:bzr push into mysql-trunk-wl5378 branch (marc.alff:3351 to 3352) WL#5378
View as plain text  
 3352 Marc Alff	2011-05-09
      WL#5378 PERFORMANCE SCHEMA SUMMARY BY USER / HOST
      
      Test cleanup

    modified:
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
 3351 Marc Alff	2011-05-09 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5378

    added:
      mysql-test/collections/mysql-trunk-bug27480.push
      mysql-test/include/ipv6_func.inc
      mysql-test/include/start_slave_io.inc
      mysql-test/include/start_slave_sql.inc
    modified:
      BUILD/SETUP.sh
      client/mysql.cc*
      client/mysqlbinlog.cc
      client/mysqltest.cc
      cmake/os/WindowsCache.cmake
      cmd-line-utils/libedit/el.c
      config.h.cmake
      configure.cmake
      extra/replace.c
      include/mysql.h
      include/mysql.h.pp
      libmysql/libmysql.c
      mysql-test/collections/default.experimental
      mysql-test/include/handler.inc
      mysql-test/include/ipv6.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/events_1.result
      mysql-test/r/events_restart.result
      mysql-test/r/flush_read_lock.result
      mysql-test/r/func_misc.result
      mysql-test/r/grant2.result
      mysql-test/r/grant4.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/ipv4_as_ipv6.result
      mysql-test/r/ipv6.result
      mysql-test/r/merge.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/r/mysqldump.result
      mysql-test/r/ps_ddl.result
      mysql-test/r/temp_table.result
      mysql-test/r/trigger.result
      mysql-test/r/type_newdecimal.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/t/alter_table.test
      mysql-test/t/events_1.test
      mysql-test/t/events_restart.test
      mysql-test/t/flush_read_lock.test
      mysql-test/t/func_misc.test
      mysql-test/t/grant2.test
      mysql-test/t/grant4.test
      mysql-test/t/handler_myisam.test
      mysql-test/t/ipv4_as_ipv6.test
      mysql-test/t/ipv6.test
      mysql-test/t/merge.test
      mysql-test/t/mysqlbinlog_base64.test
      mysql-test/t/mysqlbinlog_raw_mode.test
      mysql-test/t/mysqldump.test
      mysql-test/t/ps_ddl.test
      mysql-test/t/temp_table.test
      mysql-test/t/trigger.test
      mysql-test/t/type_newdecimal.test
      scripts/make_win_bin_dist
      scripts/mysql_system_tables.sql
      sql/event_db_repository.cc
      sql/field.cc
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_inetfunc.cc
      sql/item_inetfunc.h
      sql/item_row.cc
      sql/item_strfunc.cc
      sql/log_event.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/opt_range.cc
      sql/protocol.cc
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_admin.cc
      sql/sql_alter.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_handler.cc
      sql/sql_handler.h
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_partition_admin.cc
      sql/sql_prepare.cc
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      storage/archive/ha_archive.cc
      storage/innobase/trx/trx0rec.c
      storage/myisammrg/ha_myisammrg.cc
      storage/ndb/src/kernel/blocks/lgman.cpp
      strings/decimal.c
      vio/viosocket.c
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2011-05-07 00:40:25 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2011-05-09 10:58:29 +0000
@@ -142,7 +142,7 @@ void PFS_engine_table_share::check_all_t
   DBUG_EXECUTE_IF("tampered_perfschema_table1",
                   {
                     /* Hack SETUP_INSTRUMENT, incompatible change. */
-                    all_shares[24]->m_field_def->count++;
+                    all_shares[19]->m_field_def->count++;
                   });
 
   for (current= &all_shares[0]; (*current) != NULL; current++)

=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2011-03-17 17:39:31 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2011-05-09 10:58:29 +0000
@@ -80,6 +80,7 @@ void test_bootstrap()
 
   diag("test_bootstrap");
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 0;
   param.m_rwlock_class_sizing= 0;
@@ -98,6 +99,9 @@ void test_bootstrap()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
+  param.m_host_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -130,6 +134,7 @@ PSI * load_perfschema()
   PSI_bootstrap *boot;
   PFS_global_param param;
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 10;
   param.m_rwlock_class_sizing= 10;
@@ -148,6 +153,9 @@ PSI * load_perfschema()
   param.m_events_waits_history_long_sizing= 10;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
+  param.m_host_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -1276,6 +1284,7 @@ void test_event_name_index()
 
   diag("test_event_name_index");
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
 
   /* Per mutex info waits should be at [0..9] */
@@ -1290,6 +1299,9 @@ void test_event_name_index()
   param.m_table_share_sizing= 160;
 
   param.m_thread_class_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
+  param.m_host_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;

=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc	2011-03-17 17:39:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc	2011-05-09 10:58:29 +0000
@@ -24,6 +24,8 @@
 #include "stub_pfs_global.h"
 #include "stub_server_misc.h"
 
+#include <string.h> /* memset */
+
 void test_oom()
 {
   int rc;
@@ -31,6 +33,7 @@ void test_oom()
 
   stub_alloc_always_fails= true;
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 10;
   param.m_rwlock_class_sizing= 0;
@@ -49,6 +52,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -78,6 +84,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -107,6 +116,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -136,6 +148,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -165,6 +180,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -194,6 +212,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -225,6 +246,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -255,6 +279,9 @@ void test_oom()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2011-03-17 17:39:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2011-05-09 10:58:29 +0000
@@ -30,6 +30,7 @@ void test_no_instruments()
   int rc;
   PFS_global_param param;
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 0;
   param.m_rwlock_class_sizing= 0;
@@ -48,6 +49,9 @@ void test_no_instruments()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -79,6 +83,7 @@ void test_no_instances()
   PFS_table *table;
   PFS_global_param param;
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 1;
   param.m_rwlock_class_sizing= 1;
@@ -97,6 +102,9 @@ void test_no_instances()
   param.m_events_waits_history_long_sizing= 0;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;
@@ -201,6 +209,7 @@ void test_with_instances()
   PFS_table *table_2;
   PFS_global_param param;
 
+  memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
   param.m_mutex_class_sizing= 1;
   param.m_rwlock_class_sizing= 1;
@@ -219,6 +228,9 @@ void test_with_instances()
   param.m_events_waits_history_long_sizing= 10000;
   param.m_setup_actor_sizing= 0;
   param.m_setup_object_sizing= 0;
+  param.m_host_sizing= 0;
+  param.m_user_sizing= 0;
+  param.m_account_sizing= 0;
   param.m_stage_class_sizing= 0;
   param.m_events_stages_history_sizing= 0;
   param.m_events_stages_history_long_sizing= 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5378 branch (marc.alff:3351 to 3352) WL#5378Marc Alff9 May