List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:August 18 2011 11:56am
Subject:bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3361 to 3363)
View as plain text  
 3363 Andrei Elkin	2011-08-18
      updating result files that were left incorrect by the last merge.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
 3362 Andrei Elkin	2011-08-18
      wl#5569 MTS
      
      Failure in recovery when binlog-checksum is active.
      The reason of the failure was in that parsing of relay log 
      by MTS recovery gaps computing
      did not make sure to use the relay-log own FormatDescriptor events that
      contain checksumming info for all events in the log.
      
      Fixed with taking care to find out the checksum algorithm for every relay log as the first step of
      MTS recovery gaps computing.
     @ mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt
        forcing master to checksum.
     @ mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt
        forcing slave to *not* checksum.
     @ mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test
        same as rpl_mixed_mts_rec_crash_safe but to run in master with checksum and slave without own checksum.
        The test verifies that checksum does not affect recovery. Lack of own checksumming on slave
        allows to test more scenarios.
     @ sql/rpl_slave.cc
        Search for the checksum algorithm FD is added. 
        Notice that the first three events to read is enough to 
        find out the master side checksum alg.

    added:
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test
    modified:
      sql/rpl_slave.cc
 3361 Andrei Elkin	2011-08-17 [merge]
      merge from trunk forced to resolve few semantical conflicts caused by changes in THD::enter_cond() of the trunk.

    added:
      client/mysql_plugin.c
      mysql-test/include/daemon_example_bad_format.ini
      mysql-test/include/daemon_example_bad_soname.ini
      mysql-test/include/have_optimizer_trace.inc
      mysql-test/r/mysql_plugin.result
      mysql-test/suite/innodb/r/innodb_bug59733.result
      mysql-test/suite/innodb/t/innodb_bug59733.test
      mysql-test/suite/opt_trace/
      mysql-test/suite/opt_trace/include/
      mysql-test/suite/opt_trace/include/bugs.inc
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/include/security.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/debug.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/opt_trace/t/
      mysql-test/suite/opt_trace/t/bugs_no_prot_all.test
      mysql-test/suite/opt_trace/t/bugs_no_prot_none.test
      mysql-test/suite/opt_trace/t/bugs_ps_prot_all.test
      mysql-test/suite/opt_trace/t/bugs_ps_prot_none.test
      mysql-test/suite/opt_trace/t/charset.test
      mysql-test/suite/opt_trace/t/debug.test
      mysql-test/suite/opt_trace/t/general2_no_prot.test
      mysql-test/suite/opt_trace/t/general2_ps_prot.test
      mysql-test/suite/opt_trace/t/general_no_prot_all.test
      mysql-test/suite/opt_trace/t/general_no_prot_none.test
      mysql-test/suite/opt_trace/t/general_ps_prot_all.test
      mysql-test/suite/opt_trace/t/general_ps_prot_none.test
      mysql-test/suite/opt_trace/t/range_no_prot.test
      mysql-test/suite/opt_trace/t/range_ps_prot.test
      mysql-test/suite/opt_trace/t/security_no_prot.test
      mysql-test/suite/opt_trace/t/security_ps_prot.test
      mysql-test/suite/opt_trace/t/subquery_no_prot.test
      mysql-test/suite/opt_trace/t/subquery_ps_prot.test
      mysql-test/suite/opt_trace/validate_json.py
      mysql-test/suite/perfschema/include/connection_cleanup.inc
      mysql-test/suite/perfschema/include/connection_load.inc
      mysql-test/suite/perfschema/include/connection_setup.inc
      mysql-test/suite/perfschema/include/no_protocol.inc
      mysql-test/suite/perfschema/include/stage_cleanup.inc
      mysql-test/suite/perfschema/include/stage_setup.inc
      mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
      mysql-test/suite/perfschema/r/connection.result
      mysql-test/suite/perfschema/r/connection_3a.result
      mysql-test/suite/perfschema/r/connection_3a_3u.result
      mysql-test/suite/perfschema/r/connection_3u.result
      mysql-test/suite/perfschema/r/ddl_accounts.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_hosts.result
      mysql-test/suite/perfschema/r/ddl_users.result
      mysql-test/suite/perfschema/r/dml_accounts.result
      mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_hosts.result
      mysql-test/suite/perfschema/r/dml_users.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_u.result
      mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
      mysql-test/suite/perfschema/r/stage_mdl_function.result
      mysql-test/suite/perfschema/r/stage_mdl_global.result
      mysql-test/suite/perfschema/r/stage_mdl_procedure.result
      mysql-test/suite/perfschema/r/stage_mdl_table.result
      mysql-test/suite/perfschema/r/start_server_no_account.result
      mysql-test/suite/perfschema/r/start_server_no_host.result
      mysql-test/suite/perfschema/r/start_server_no_user.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
      mysql-test/suite/perfschema/t/connection.test
      mysql-test/suite/perfschema/t/connection_3a-master.opt
      mysql-test/suite/perfschema/t/connection_3a.test
      mysql-test/suite/perfschema/t/connection_3a_3u-master.opt
      mysql-test/suite/perfschema/t/connection_3a_3u.test
      mysql-test/suite/perfschema/t/connection_3u-master.opt
      mysql-test/suite/perfschema/t/connection_3u.test
      mysql-test/suite/perfschema/t/ddl_accounts.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_hosts.test
      mysql-test/suite/perfschema/t/ddl_users.test
      mysql-test/suite/perfschema/t/dml_accounts.test
      mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_hosts.test
      mysql-test/suite/perfschema/t/dml_users.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
      mysql-test/suite/perfschema/t/stage_mdl_function.test
      mysql-test/suite/perfschema/t/stage_mdl_global.test
      mysql-test/suite/perfschema/t/stage_mdl_procedure.test
      mysql-test/suite/perfschema/t/stage_mdl_table.test
      mysql-test/suite/perfschema/t/start_server_no_account-master.opt
      mysql-test/suite/perfschema/t/start_server_no_account.test
      mysql-test/suite/perfschema/t/start_server_no_host-master.opt
      mysql-test/suite/perfschema/t/start_server_no_host.test
      mysql-test/suite/perfschema/t/start_server_no_user-master.opt
      mysql-test/suite/perfschema/t/start_server_no_user.test
      mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt
      mysql-test/suite/perfschema/t/start_server_no_waits_history.test
      mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt
      mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test
      mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result
      mysql-test/suite/sys_vars/r/innodb_flush_neighbors_basic.result
      mysql-test/suite/sys_vars/r/innodb_lru_scan_depth_basic.result
      mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_method_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_features_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_limit_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_max_mem_size_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_offset_basic.result
      mysql-test/suite/sys_vars/r/optimizer_trace_offset_max.result
      mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result
      mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result
      mysql-test/suite/sys_vars/r/pfs_users_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic-master.opt
      mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test
      mysql-test/suite/sys_vars/t/innodb_flush_neighbors_basic.test
      mysql-test/suite/sys_vars/t/innodb_lru_scan_depth_basic.test
      mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_method_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_features_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_limit_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_max_mem_size_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_offset_basic.test
      mysql-test/suite/sys_vars/t/optimizer_trace_offset_max-master.opt
      mysql-test/suite/sys_vars/t/optimizer_trace_offset_max.test
      mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test
      mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test
      mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_users_size_basic.test
      mysql-test/t/mysql_plugin-master.opt
      mysql-test/t/mysql_plugin.test
      plugin/daemon_example/daemon_example.ini
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/opt_trace_Doxyfile
      sql/opt_trace_context.h
      storage/perfschema/cursor_by_account.cc
      storage/perfschema/cursor_by_account.h
      storage/perfschema/cursor_by_host.cc
      storage/perfschema/cursor_by_host.h
      storage/perfschema/cursor_by_thread.cc
      storage/perfschema/cursor_by_thread.h
      storage/perfschema/cursor_by_user.cc
      storage/perfschema/cursor_by_user.h
      storage/perfschema/pfs_account.cc
      storage/perfschema/pfs_account.h
      storage/perfschema/pfs_host.cc
      storage/perfschema/pfs_host.h
      storage/perfschema/pfs_user.cc
      storage/perfschema/pfs_user.h
      storage/perfschema/table_accounts.cc
      storage/perfschema/table_accounts.h
      storage/perfschema/table_esgs_by_account_by_event_name.cc
      storage/perfschema/table_esgs_by_account_by_event_name.h
      storage/perfschema/table_esgs_by_host_by_event_name.cc
      storage/perfschema/table_esgs_by_host_by_event_name.h
      storage/perfschema/table_esgs_by_user_by_event_name.cc
      storage/perfschema/table_esgs_by_user_by_event_name.h
      storage/perfschema/table_esms_by_account_by_event_name.cc
      storage/perfschema/table_esms_by_account_by_event_name.h
      storage/perfschema/table_esms_by_host_by_event_name.cc
      storage/perfschema/table_esms_by_host_by_event_name.h
      storage/perfschema/table_esms_by_user_by_event_name.cc
      storage/perfschema/table_esms_by_user_by_event_name.h
      storage/perfschema/table_ews_by_account_by_event_name.cc
      storage/perfschema/table_ews_by_account_by_event_name.h
      storage/perfschema/table_ews_by_host_by_event_name.cc
      storage/perfschema/table_ews_by_host_by_event_name.h
      storage/perfschema/table_ews_by_user_by_event_name.cc
      storage/perfschema/table_ews_by_user_by_event_name.h
      storage/perfschema/table_hosts.cc
      storage/perfschema/table_hosts.h
      storage/perfschema/table_users.cc
      storage/perfschema/table_users.h
      storage/perfschema/unittest/pfs_account-oom-t.cc
      storage/perfschema/unittest/pfs_host-oom-t.cc
      storage/perfschema/unittest/pfs_user-oom-t.cc
      unittest/gunit/opt_trace-t.cc
    renamed:
      mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result => mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
      mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test => mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test
    modified:
      .bzrignore
      CMakeLists.txt
      client/CMakeLists.txt
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqltest.cc
      client/readline.cc
      cmake/create_initial_db.cmake.in
      config.h.cmake
      configure.cmake
      dbug/dbug.c
      dbug/dbug_analyze.c
      dbug/my_main.c
      dbug/tests.c
      include/my_getopt.h
      include/my_global.h
      include/my_sys.h
      include/mysql/plugin.h
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h.pp
      libmysqld/emb_qcache.cc
      libmysqld/lib_sql.cc
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/include/icp_tests.inc
      mysql-test/include/join_cache.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/plugin.defs
      mysql-test/include/range.inc
      mysql-test/include/subquery.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/archive_gis.result
      mysql-test/r/auto_increment.result
      mysql-test/r/bench_count_distinct.result
      mysql-test/r/bigint.result
      mysql-test/r/case.result
      mysql-test/r/cast.result
      mysql-test/r/compare.result
      mysql-test/r/compress.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_collate.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/date_formats.result
      mysql-test/r/explain.result
      mysql-test/r/fulltext.result
      mysql-test/r/func_compress.result
      mysql-test/r/func_crypt.result
      mysql-test/r/func_default.result
      mysql-test/r/func_encrypt.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_group.result
      mysql-test/r/func_if.result
      mysql-test/r/func_in_all.result
      mysql-test/r/func_in_icp.result
      mysql-test/r/func_in_icp_mrr.result
      mysql-test/r/func_in_mrr.result
      mysql-test/r/func_in_mrr_cost.result
      mysql-test/r/func_in_none.result
      mysql-test/r/func_like.result
      mysql-test/r/func_math.result
      mysql-test/r/func_op.result
      mysql-test/r/func_regexp.result
      mysql-test/r/func_set.result
      mysql-test/r/func_str.result
      mysql-test/r/func_system.result
      mysql-test/r/func_test.result
      mysql-test/r/func_time.result
      mysql-test/r/gis.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/having.result
      mysql-test/r/information_schema-big.result
      mysql-test/r/information_schema.result
      mysql-test/r/information_schema_db.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/insert_update.result
      mysql-test/r/join.result
      mysql-test/r/join_cache_jcl0.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_cache_jcl2.result
      mysql-test/r/join_cache_jcl3.result
      mysql-test/r/join_cache_jcl4.result
      mysql-test/r/join_cache_jcl5.result
      mysql-test/r/join_cache_jcl6.result
      mysql-test/r/join_cache_jcl7.result
      mysql-test/r/join_cache_jcl8.result
      mysql-test/r/join_nested.result
      mysql-test/r/join_nested_jcl6.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/merge.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_all.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/mysql_binary_mode.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/named_pipe.result
      mysql-test/r/negation_elimination.result
      mysql-test/r/null.result
      mysql-test/r/olap.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/parser.result
      mysql-test/r/partition.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/ps.result
      mysql-test/r/query_cache.result
      mysql-test/r/range_all.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_mrr_cost.result
      mysql-test/r/range_none.result
      mysql-test/r/row.result
      mysql-test/r/select_all.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/shm.result
      mysql-test/r/signal.result
      mysql-test/r/signal_demo3.result
      mysql-test/r/sp-big.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.result
      mysql-test/r/sp_trans.result
      mysql-test/r/ssl.result
      mysql-test/r/ssl_compress.result
      mysql-test/r/strict.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_jcl6.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/type_blob.result
      mysql-test/r/type_datetime.result
      mysql-test/r/udf.result
      mysql-test/r/union.result
      mysql-test/r/varbinary.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
      mysql-test/suite/engines/funcs/r/sf_alter.result
      mysql-test/suite/engines/funcs/r/sf_cursor.result
      mysql-test/suite/engines/funcs/r/sp_alter.result
      mysql-test/suite/engines/funcs/r/sp_cursor.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_is.result
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/innodb/r/innodb-analyze.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-analyze.test
      mysql-test/suite/innodb/t/innodb-zip.test
      mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt
      mysql-test/suite/innodb/t/innodb_bug54044.test
      mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
      mysql-test/suite/perfschema/include/event_aggregate_load.inc
      mysql-test/suite/perfschema/include/event_aggregate_setup.inc
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
      mysql-test/suite/perfschema/include/table_io_setup_helper.inc
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/r/csv_table_io.result
      mysql-test/suite/perfschema/r/event_aggregate.result
      mysql-test/suite/perfschema/r/indexed_table_io.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/innodb_table_io.result
      mysql-test/suite/perfschema/r/memory_table_io.result
      mysql-test/suite/perfschema/r/merge_table_io.result
      mysql-test/suite/perfschema/r/multi_table_io.result
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/r/myisam_table_io.result
      mysql-test/suite/perfschema/r/ortho_iter.result
      mysql-test/suite/perfschema/r/part_table_io.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/r/rollback_table_io.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/setup_objects.result
      mysql-test/suite/perfschema/r/start_server_innodb.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_stage_class.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_statement_class.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_off.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_schema.result
      mysql-test/suite/perfschema/r/temp_table_io.result
      mysql-test/suite/perfschema/r/trigger_table_io.result
      mysql-test/suite/perfschema/r/view_table_io.result
      mysql-test/suite/perfschema/t/checksum.test
      mysql-test/suite/perfschema/t/setup_objects.test
      mysql-test/suite/perfschema/t/start_server_nothing-master.opt
      mysql-test/suite/perfschema/t/start_server_nothing.test
      mysql-test/suite/rpl/r/rpl_get_lock.result
      mysql-test/suite/rpl/r/rpl_master_pos_wait.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_sp005.result
      mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
      mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
      mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
      mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
      mysql-test/t/bootstrap-master.opt
      mysql-test/t/bootstrap.test
      mysql-test/t/ctype_utf8mb4-master.opt
      mysql-test/t/func_if.test
      mysql-test/t/func_str.test
      mysql-test/t/func_time.test
      mysql-test/t/group_by.test
      mysql-test/t/information_schema.test
      mysql-test/t/merge.test
      mysql-test/t/mysql_binary_mode.test
      mysql-test/t/parser.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/sp_trans.test
      mysys/array.c
      mysys/my_alloc.c
      mysys/my_getopt.c
      mysys/my_init.c
      mysys/my_malloc.c
      mysys/my_static.c
      mysys/my_thr_init.c
      mysys/mysys_priv.h
      mysys/thr_lock.c
      plugin/daemon_example/CMakeLists.txt
      plugin/semisync/semisync_master.cc
      plugin/semisync/semisync_master.h
      plugin/semisync/semisync_master_plugin.cc
      scripts/mysql_system_tables.sql
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/debug_sync.cc
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/event_parse_data.cc
      sql/event_queue.cc
      sql/event_queue.h
      sql/event_scheduler.cc
      sql/event_scheduler.h
      sql/events.cc
      sql/events.h
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_geofunc.cc
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_xmlfunc.cc
      sql/log.cc
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/my_decimal.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_explain.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/partition_info.cc
      sql/protocol.cc
      sql/replication.h
      sql/rpl_info_file.cc
      sql/rpl_master.cc
      sql/rpl_record.cc
      sql/rpl_reporting.cc
      sql/rpl_rli.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sp.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sp_pcontext.cc
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/sql_acl.cc
      sql/sql_admin.cc
      sql/sql_alloc_error_handler.cc
      sql/sql_alter.cc
      sql/sql_array.h
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_derived.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_join_cache.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_locale.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_prepare.h
      sql/sql_priv.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_tablespace.cc
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_trigger.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/unireg.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0trx.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0log.c
      storage/innobase/read/read0read.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0vers.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0i_s.c
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0roll.c
      storage/innobase/trx/trx0rseg.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0trx.c
      storage/innobase/trx/trx0undo.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/myrg_open.c
      storage/perfschema/CMakeLists.txt
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events_stages.cc
      storage/perfschema/pfs_events_stages.h
      storage/perfschema/pfs_events_statements.cc
      storage/perfschema/pfs_events_statements.h
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_events_waits.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/pfs_server.h
      storage/perfschema/pfs_setup_actor.cc
      storage/perfschema/pfs_setup_object.cc
      storage/perfschema/pfs_stat.h
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/pfs_visitor.h
      storage/perfschema/table_esgs_global_by_event_name.cc
      storage/perfschema/table_esms_global_by_event_name.cc
      storage/perfschema/table_helper.cc
      storage/perfschema/table_helper.h
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
      storage/perfschema/unittest/CMakeLists.txt
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-oom-t.cc
      storage/perfschema/unittest/stub_pfs_global.h
      support-files/mysql.spec.sh
      unittest/gunit/CMakeLists.txt
      unittest/gunit/test_mdl_context_owner.h
      unittest/gunit/test_utils.cc
      unittest/gunit/test_utils.h
      mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
      mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2011-08-17 08:21:23 +0000
+++ b/mysql-test/r/information_schema.result	2011-08-18 11:56:01 +0000
@@ -890,7 +890,7 @@ AND table_name not like 'ndb%' AND table
 GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
 information_schema	31
-mysql	25
+mysql	26
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
 begin

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-08-17 08:21:23 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-08-18 11:56:01 +0000
@@ -8,52 +8,52 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-ERROR 1050 (42S01) at line 96: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 120: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 144: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 194: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 207: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 221: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 246: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 255: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 266: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 278: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 287: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 301: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 311: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 321: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 330: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 338: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 347: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 358: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 366: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 411: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 455: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 534: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 554: Table 'threads' already exists
-ERROR 1050 (42S01) at line 569: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 584: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 599: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 612: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 638: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 652: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 664: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 707: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 750: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 857: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 889: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 922: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 953: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 971: Table 'users' already exists
-ERROR 1050 (42S01) at line 981: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1401: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 288: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 302: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 312: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 322: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 348: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 359: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 367: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 412: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 456: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 535: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 555: Table 'threads' already exists
+ERROR 1050 (42S01) at line 570: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 600: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 613: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 626: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 639: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 653: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 665: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 708: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 751: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 794: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 826: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 890: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 923: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 954: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 963: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 972: Table 'users' already exists
+ERROR 1050 (42S01) at line 982: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1402: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -66,52 +66,52 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-ERROR 1050 (42S01) at line 96: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 120: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 144: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 194: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 207: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 221: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 246: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 255: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 266: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 278: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 287: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 301: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 311: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 321: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 330: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 338: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 347: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 358: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 366: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 411: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 455: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 534: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 554: Table 'threads' already exists
-ERROR 1050 (42S01) at line 569: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 584: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 599: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 612: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 638: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 652: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 664: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 707: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 750: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 857: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 889: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 922: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 953: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 971: Table 'users' already exists
-ERROR 1050 (42S01) at line 981: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1401: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 288: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 302: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 312: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 322: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 348: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 359: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 367: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 412: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 456: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 535: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 555: Table 'threads' already exists
+ERROR 1050 (42S01) at line 570: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 600: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 613: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 626: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 639: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 653: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 665: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 708: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 751: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 794: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 826: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 890: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 923: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 954: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 963: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 972: Table 'users' already exists
+ERROR 1050 (42S01) at line 982: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1402: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -122,52 +122,52 @@ drop view test.user_view;
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
-ERROR 1050 (42S01) at line 96: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 120: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 144: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 194: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 207: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 221: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 246: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 255: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 266: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 278: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 287: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 301: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 311: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 321: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 330: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 338: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 347: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 358: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 366: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 411: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 455: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 534: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 554: Table 'threads' already exists
-ERROR 1050 (42S01) at line 569: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 584: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 599: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 612: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 638: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 652: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 664: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 707: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 750: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 857: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 889: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 922: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 953: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 971: Table 'users' already exists
-ERROR 1050 (42S01) at line 981: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1401: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 288: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 302: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 312: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 322: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 348: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 359: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 367: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 412: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 456: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 535: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 555: Table 'threads' already exists
+ERROR 1050 (42S01) at line 570: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 600: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 613: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 626: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 639: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 653: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 665: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 708: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 751: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 794: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 826: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 890: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 923: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 954: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 963: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 972: Table 'users' already exists
+ERROR 1050 (42S01) at line 982: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1402: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -178,52 +178,52 @@ drop procedure test.user_proc;
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
-ERROR 1050 (42S01) at line 96: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 120: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 144: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 194: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 207: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 221: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 246: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 255: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 266: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 278: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 287: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 301: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 311: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 321: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 330: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 338: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 347: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 358: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 366: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 411: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 455: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 534: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 554: Table 'threads' already exists
-ERROR 1050 (42S01) at line 569: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 584: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 599: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 612: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 638: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 652: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 664: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 707: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 750: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 857: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 889: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 922: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 953: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 971: Table 'users' already exists
-ERROR 1050 (42S01) at line 981: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1401: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 288: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 302: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 312: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 322: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 348: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 359: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 367: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 412: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 456: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 535: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 555: Table 'threads' already exists
+ERROR 1050 (42S01) at line 570: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 600: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 613: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 626: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 639: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 653: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 665: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 708: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 751: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 794: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 826: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 890: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 923: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 954: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 963: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 972: Table 'users' already exists
+ERROR 1050 (42S01) at line 982: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1402: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -234,52 +234,52 @@ drop function test.user_func;
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
 update mysql.event set db='performance_schema' where name='user_event';
-ERROR 1050 (42S01) at line 96: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 120: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 144: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 194: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 207: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 221: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 234: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 246: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 255: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 266: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 278: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 287: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 301: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 311: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 321: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 330: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 338: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 347: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 358: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 366: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 411: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 455: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 534: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 554: Table 'threads' already exists
-ERROR 1050 (42S01) at line 569: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 584: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 599: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 612: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 638: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 652: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 664: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 707: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 750: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 825: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 857: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 889: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 922: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 953: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 971: Table 'users' already exists
-ERROR 1050 (42S01) at line 981: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1401: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 288: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 302: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 312: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 322: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 348: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 359: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 367: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 412: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 456: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 535: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 555: Table 'threads' already exists
+ERROR 1050 (42S01) at line 570: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 600: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 613: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 626: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 639: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 653: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 665: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 708: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 751: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 794: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 826: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 890: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 923: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 954: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 963: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 972: Table 'users' already exists
+ERROR 1050 (42S01) at line 982: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1402: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== added file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt	2011-08-18 11:44:59 +0000
@@ -0,0 +1 @@
+--binlog-checksum=CRC32

=== added file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt	2011-08-18 11:44:59 +0000
@@ -0,0 +1 @@
+--skip-core-file --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1 --relay-log-recovery=1 --binlog-checksum=NONE

=== added file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test	2011-08-18 11:44:59 +0000
@@ -0,0 +1,12 @@
+--source include/master-slave.inc
+--source include/have_binlog_format_mixed.inc
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+
+call mtr.add_suppression('Attempting backtrace');
+call mtr.add_suppression("Recovery from master pos .*");
+call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
+call mtr.add_suppression(".*int __cxa_pure_virtual().*");
+
+--source extra/rpl_tests/rpl_mts_crash_safe.test

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-08-17 08:21:23 +0000
+++ b/sql/rpl_slave.cc	2011-08-18 11:44:59 +0000
@@ -3997,8 +3997,9 @@ bool mts_recovery_groups(Relay_log_info 
         while(!eof);
         continue;
   */
-  Format_description_log_event fdle(BINLOG_VERSION);
-  if (!fdle.is_valid())
+  Format_description_log_event fdle(BINLOG_VERSION), *p_fdle= &fdle;
+
+  if (!p_fdle->is_valid())
   {
     error= TRUE;
     goto err;
@@ -4012,6 +4013,7 @@ bool mts_recovery_groups(Relay_log_info 
                       dynamic_array_ptr(&above_lwm_jobs, it_job))->worker;
     LOG_POS_COORD w_last= { const_cast<char*>(w->get_group_master_log_name()),
                             w->get_group_master_log_pos() };
+    bool checksum_detected= FALSE;
 
     sql_print_information("Recovery relay log info based on Worker-Id %lu, "
                           "group_relay_log_name %s, group_relay_log_pos %lu "
@@ -4039,14 +4041,40 @@ bool mts_recovery_groups(Relay_log_info 
         sql_print_error("%s", errmsg);
         goto err;
       }
+      /*
+        Looking for the actual relay checksum algorithm that is present in
+        a FD at head events of the relay log.
+      */
+      if (!checksum_detected)
+      {
+        for (int i=0; i < 3; i++)
+        {
+          if ((ev= Log_event::read_log_event(&log,
+                                             (mysql_mutex_t*) 0, p_fdle, 0))
+              && ev->get_type_code() == FORMAT_DESCRIPTION_EVENT)
+            p_fdle->checksum_alg= ev->checksum_alg;
+          checksum_detected= TRUE;
+        }
+        if (!checksum_detected)
+        {
+          error= TRUE;
+          sql_print_error("%s", "malformed or very old relay log which "
+                          "does not have FormatDescriptor");
+          goto err;
+        }
+      }
 
       my_b_seek(&log, offset);
+
       while (not_reached_commit &&
-             (ev= Log_event::read_log_event(&log, 0, &fdle,
-                                            opt_master_verify_checksum)))
+             (ev= Log_event::read_log_event(&log, 0, p_fdle,
+                                            opt_slave_sql_verify_checksum)))
       {
         DBUG_ASSERT(ev->is_valid());
 
+        if (ev->get_type_code() == FORMAT_DESCRIPTION_EVENT)
+          p_fdle->checksum_alg= ev->checksum_alg;
+
         if (ev->get_type_code() == ROTATE_EVENT ||
             ev->get_type_code() == FORMAT_DESCRIPTION_EVENT) 
         {
@@ -4118,6 +4146,7 @@ bool mts_recovery_groups(Relay_log_info 
          goto err;
       }
     }
+
     rli->mts_recovery_group_cnt= (rli->mts_recovery_group_cnt < recovery_group_cnt ?
       recovery_group_cnt : rli->mts_recovery_group_cnt);
   }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3361 to 3363) Andrei Elkin22 Aug