From: Christopher Powers Date: May 25 2011 2:04pm Subject: bzr push into mysql-trunk branch (chris.powers:3296 to 3297) WL#4896 List-Archive: http://lists.mysql.com/commits/138079 Message-Id: <20110525140441.687E01DB032F@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1313721643213827184==" --===============1313721643213827184== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3297 Christopher Powers 2011-05-25 WL#4896 "Performance Schema Net IO" - Fix PB failures modified: mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result 3296 Christopher Powers 2011-05-17 [merge] WL#4896 "Performance Schema Net IO" - Merge with mysql-trunk added: mysql-test/collections/mysql-trunk-bug27480.push mysql-test/extra/rpl_tests/rpl_temp_error.test mysql-test/include/ipv6_func.inc mysql-test/include/start_slave_io.inc mysql-test/include/start_slave_sql.inc mysql-test/lib/mtr_results.pm mysql-test/r/implicit_char_to_num_conversion.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/t/pfs_upgrade.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/t/rpl_DML_error.test mysql-test/t/implicit_char_to_num_conversion.test unittest/gunit/opt_range-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h modified: .bzrignore BUILD/SETUP.sh CMakeLists.txt client/mysql.cc* client/mysqlbinlog.cc client/mysqltest.cc extra/replace.c include/mysql.h include/mysql.h.pp libmysql/libmysql.c mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/check_type.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/include/handler.inc mysql-test/include/ipv6.inc mysql-test/include/wait_show_condition.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf8.result mysql-test/r/distinct.result mysql-test/r/events_1.result mysql-test/r/events_restart.result mysql-test/r/explain.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/having.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/ipv4_as_ipv6.result mysql-test/r/ipv6.result mysql-test/r/merge.result mysql-test/r/metadata.result mysql-test/r/mysqlbinlog_base64.result mysql-test/r/mysqldump.result mysql-test/r/ps_ddl.result mysql-test/r/read_only_innodb.result mysql-test/r/temp_table.result mysql-test/r/trigger.result mysql-test/r/type_newdecimal.result mysql-test/r/type_ranges.result mysql-test/r/variables-big.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/binlog/t/binlog_innodb_row.test 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_begin_commit_rollback.result 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_loaddatalocal.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_server_id2.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test 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_loaddatalocal.test mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/rpl/t/rpl_row_until.test mysql-test/suite/rpl/t/rpl_server_id2.test mysql-test/suite/rpl/t/rpl_show_slave_hosts.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/t/alter_table.test mysql-test/t/distinct.test mysql-test/t/events_1.test mysql-test/t/events_restart.test mysql-test/t/explain.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/having.test mysql-test/t/innodb_mysql_lock.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 mysql-test/t/variables-big.test mysys/lf_alloc-pin.c mysys/thr_alarm.c packaging/WiX/ca/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/custom_ui.wxs scripts/make_win_bin_dist scripts/mysql_system_tables.sql sql/binlog.cc sql/binlog.h sql/event_db_repository.cc sql/field.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.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/item_xmlfunc.cc sql/item_xmlfunc.h sql/log_event.cc sql/my_decimal.cc sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/protocol.cc sql/rpl_info_file.cc sql/rpl_injector.cc sql/rpl_injector.h sql/rpl_master.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt 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.cc sql/sql_class.h sql/sql_db.cc sql/sql_delete.cc sql/sql_handler.cc sql/sql_handler.h sql/sql_insert.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_partition.h sql/sql_partition_admin.cc sql/sql_prepare.cc sql/sql_priv.h sql/sql_rename.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_truncate.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h sql/transaction.cc storage/archive/ha_archive.cc storage/innobase/handler/i_s.cc storage/myisammrg/ha_myisammrg.cc storage/ndb/src/kernel/blocks/lgman.cpp storage/perfschema/pfs.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_setup_object.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h strings/decimal.c unittest/gunit/CMakeLists.txt unittest/gunit/item-t.cc unittest/mysys/lf-t.c vio/viosocket.c === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-05-25 14:04:29 +0000 @@ -18,30 +18,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -64,30 +67,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -108,30 +114,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -152,30 +161,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -196,30 +208,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name === modified file 'mysql-test/suite/perfschema/r/schema.result' --- a/mysql-test/suite/perfschema/r/schema.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/schema.result 2011-05-25 14:04:29 +0000 @@ -36,6 +36,9 @@ setup_consumers setup_instruments setup_objects setup_timers +socket_instances +socket_summary_by_event_name +socket_summary_by_instance table_io_waits_summary_by_index_usage table_io_waits_summary_by_table table_lock_waits_summary_by_table --===============1313721643213827184== 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: 2174d261331f5408045a9958420d5774cb13476b # timestamp: 2011-05-25 09:04:41 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: chris.powers@stripped\ # 8ilbh6wqaw61ysj8 # # Begin bundle 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 nChIZfHy9QA= --===============1313721643213827184==--