List:Commits« Previous MessageNext Message »
From:Evgeny Potemkin Date:August 15 2011 9:51am
Subject:bzr push into mysql-trunk branch (evgeny.potemkin:3017 to 3018)
View as plain text  
 3018 Evgeny Potemkin	2011-08-15
      Post merge fix: updated a test case with the correct result.

    modified:
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
 3017 Evgeny Potemkin	2011-08-15 [merge]
      Manual merge: mysql-trunk => wl5274.

    added:
      client/mysql_plugin.c
      mysql-test/include/daemon_example_bad_format.ini
      mysql-test/include/daemon_example_bad_soname.ini
      mysql-test/r/mysql_plugin.result
      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/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/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/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/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/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
      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
    modified:
      client/CMakeLists.txt
      include/my_global.h
      mysql-test/collections/default.experimental
      mysql-test/include/icp_tests.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/plugin.defs
      mysql-test/include/subquery.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/group_by.result
      mysql-test/r/information_schema.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_cost.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/myisam_icp.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_cost.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/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/sp.result
      mysql-test/r/sp_trans.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      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/innodb/r/innodb-analyze.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb_monitor.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/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      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/stage_setup.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/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/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/group_by.test
      mysql-test/t/information_schema.test
      mysql-test/t/sp.test
      mysql-test/t/sp_trans.test
      mysys/my_init.c
      mysys/my_thr_init.c
      mysys/mysys_priv.h
      plugin/daemon_example/CMakeLists.txt
      scripts/mysql_system_tables.sql
      sql/handler.cc
      sql/handler.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_subselect.cc
      sql/item_xmlfunc.cc
      sql/mysqld.cc
      sql/opt_explain.cc
      sql/rpl_info_file.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_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_test.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      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/handler/ha_innodb.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      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/trx0sys.h
      storage/innobase/log/log0log.c
      storage/innobase/read/read0read.c
      storage/innobase/row/row0sel.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/trx/trx0sys.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
=== modified file 'mysql-test/suite/opt_trace/r/general2_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/general2_ps_prot.result	2011-08-15 09:44:00 +0000
+++ b/mysql-test/suite/opt_trace/r/general2_ps_prot.result	2011-08-15 09:51:23 +0000
@@ -2994,288 +2994,330 @@ select 497, tmp.ID, NULL from (select 49
       } /* join_preparation */
     },
     {
+      "join_preparation": {
+        "select#": 1,
+        "steps": [
+          {
+            "expanded_query": "/* select#1 */ select 497 AS `497`,`tmp`.`ID` AS `ID`,NULL AS `NULL` from (/* select#2 */ select 497 AS `ID`,max(`test`.`t3`.`DATA`) AS `DATA` from ((`test`.`t1` join `test`.`t2` on((`test`.`t1`.`OBJECTID` = `test`.`t2`.`ID`))) join `test`.`t3` on((`test`.`t1`.`OBJECTID` = `test`.`t3`.`ID`))) group by `test`.`t2`.`PARID` order by max(`test`.`t3`.`DATA`) desc) `tmp`"
+          }
+        ] /* steps */
+      } /* join_preparation */
+    },
+    {
       "join_optimization": {
-        "select#": 2,
+        "select#": 1,
         "steps": [
           {
-            "condition_processing": {
-              "condition": "WHERE",
-              "original_condition": "((`test`.`t1`.`OBJECTID` = `test`.`t3`.`ID`) and (`test`.`t1`.`OBJECTID` = `test`.`t2`.`ID`))",
+            "join_optimization": {
+              "select#": 2,
               "steps": [
                 {
-                  "transformation": "equality_propagation",
-                  "resulting_condition": "(multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`))"
+                  "condition_processing": {
+                    "condition": "WHERE",
+                    "original_condition": "((`test`.`t1`.`OBJECTID` = `test`.`t3`.`ID`) and (`test`.`t1`.`OBJECTID` = `test`.`t2`.`ID`))",
+                    "steps": [
+                      {
+                        "transformation": "equality_propagation",
+                        "resulting_condition": "(multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`))"
+                      },
+                      {
+                        "transformation": "constant_propagation",
+                        "resulting_condition": "(multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`))"
+                      },
+                      {
+                        "transformation": "trivial_condition_removal",
+                        "resulting_condition": "multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`)"
+                      }
+                    ] /* steps */
+                  } /* condition_processing */
                 },
                 {
-                  "transformation": "constant_propagation",
-                  "resulting_condition": "(multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`))"
+                  "ref_optimizer_key_uses": [
+                    {
+                      "database": "test",
+                      "table": "t1",
+                      "field": "OBJECTID",
+                      "equals": "`test`.`t3`.`ID`",
+                      "null_rejecting": true
+                    },
+                    {
+                      "database": "test",
+                      "table": "t1",
+                      "field": "OBJECTID",
+                      "equals": "`test`.`t2`.`ID`",
+                      "null_rejecting": true
+                    },
+                    {
+                      "database": "test",
+                      "table": "t2",
+                      "field": "ID",
+                      "equals": "`test`.`t1`.`OBJECTID`",
+                      "null_rejecting": false
+                    },
+                    {
+                      "database": "test",
+                      "table": "t2",
+                      "field": "ID",
+                      "equals": "`test`.`t3`.`ID`",
+                      "null_rejecting": true
+                    },
+                    {
+                      "database": "test",
+                      "table": "t3",
+                      "field": "ID",
+                      "equals": "`test`.`t1`.`OBJECTID`",
+                      "null_rejecting": false
+                    },
+                    {
+                      "database": "test",
+                      "table": "t3",
+                      "field": "ID",
+                      "equals": "`test`.`t2`.`ID`",
+                      "null_rejecting": true
+                    }
+                  ] /* ref_optimizer_key_uses */
+                },
+                {
+                  "records_estimation": [
+                    {
+                      "database": "test",
+                      "table": "t1",
+                      "records": 1,
+                      "cost": 1,
+                      "table_type": "system"
+                    },
+                    {
+                      "database": "test",
+                      "table": "t2",
+                      "const_keys_added": {
+                        "keys": [
+                          "t2_PARID_IDX"
+                        ] /* keys */,
+                        "cause": "group_by"
+                      } /* const_keys_added */,
+                      "range_analysis": {
+                        "table_scan": {
+                          "records": 9,
+                          "cost": 5.9198
+                        } /* table_scan */,
+                        "potential_range_indices": [
+                          {
+                            "index": "t2_ID_IDX",
+                            "usable": false,
+                            "cause": "not_applicable"
+                          },
+                          {
+                            "index": "t2_PARID_IDX",
+                            "usable": true,
+                            "key_parts": [
+                              "PARID"
+                            ] /* key_parts */
+                          }
+                        ] /* potential_range_indices */,
+                        "setup_range_conditions": [
+                        ] /* setup_range_conditions */,
+                        "group_index_range": {
+                          "chosen": false,
+                          "cause": "not_single_table"
+                        } /* group_index_range */
+                      } /* range_analysis */
+                    },
+                    {
+                      "database": "test",
+                      "table": "t3",
+                      "const_keys_added": {
+                        "keys": [
+                        ] /* keys */,
+                        "cause": "group_by"
+                      } /* const_keys_added */,
+                      "range_analysis": {
+                        "table_scan": {
+                          "records": 8,
+                          "cost": 5.7195
+                        } /* table_scan */
+                      } /* range_analysis */
+                    }
+                  ] /* records_estimation */
                 },
                 {
-                  "transformation": "trivial_condition_removal",
-                  "resulting_condition": "multiple equal(`test`.`t1`.`OBJECTID`, `test`.`t3`.`ID`, `test`.`t2`.`ID`)"
+                  "considered_execution_plans": [
+                    {
+                      "database": "test",
+                      "table": "t3",
+                      "best_access_path": {
+                        "considered_access_paths": [
+                          {
+                            "access_type": "ref",
+                            "index": "t3_ID_IDX",
+                            "records": 0.8,
+                            "cost": 0.96,
+                            "chosen": true
+                          },
+                          {
+                            "access_type": "scan",
+                            "cost": 2,
+                            "records": 8,
+                            "cause": "cost",
+                            "chosen": false
+                          }
+                        ] /* considered_access_paths */
+                      } /* best_access_path */,
+                      "cost_for_plan": 0.96,
+                      "records_for_plan": 0.8,
+                      "rest_of_plan": [
+                        {
+                          "database": "test",
+                          "table": "t2",
+                          "best_access_path": {
+                            "considered_access_paths": [
+                              {
+                                "access_type": "ref",
+                                "index": "t2_ID_IDX",
+                                "records": 2,
+                                "cost": 2,
+                                "chosen": true
+                              },
+                              {
+                                "access_type": "scan",
+                                "cost": 2,
+                                "records": 9,
+                                "cause": "cost",
+                                "chosen": false
+                              }
+                            ] /* considered_access_paths */
+                          } /* best_access_path */,
+                          "added_to_eq_ref_extension": false
+                        },
+                        {
+                          "database": "test",
+                          "table": "t2",
+                          "best_access_path": {
+                            "considered_access_paths": [
+                              {
+                                "access_type": "ref",
+                                "index": "t2_ID_IDX",
+                                "records": 2,
+                                "cost": 2,
+                                "chosen": true
+                              },
+                              {
+                                "access_type": "scan",
+                                "cost": 2,
+                                "records": 9,
+                                "cause": "cost",
+                                "chosen": false
+                              }
+                            ] /* considered_access_paths */
+                          } /* best_access_path */,
+                          "cost_for_plan": 2.88,
+                          "records_for_plan": 1.6,
+                          "chosen": true
+                        }
+                      ] /* rest_of_plan */
+                    },
+                    {
+                      "database": "test",
+                      "table": "t2",
+                      "best_access_path": {
+                        "considered_access_paths": [
+                          {
+                            "access_type": "ref",
+                            "index": "t2_ID_IDX",
+                            "records": 0.9,
+                            "cost": 1.08,
+                            "chosen": true
+                          },
+                          {
+                            "access_type": "scan",
+                            "cost": 2,
+                            "records": 9,
+                            "cause": "cost",
+                            "chosen": false
+                          }
+                        ] /* considered_access_paths */
+                      } /* best_access_path */,
+                      "cost_for_plan": 1.08,
+                      "records_for_plan": 0.9,
+                      "pruned_by_heuristic": true
+                    }
+                  ] /* considered_execution_plans */
                 }
-              ] /* steps */
-            } /* condition_processing */
-          },
-          {
-            "ref_optimizer_key_uses": [
-              {
-                "database": "test",
-                "table": "t1",
-                "field": "OBJECTID",
-                "equals": "`test`.`t3`.`ID`",
-                "null_rejecting": true
-              },
-              {
-                "database": "test",
-                "table": "t1",
-                "field": "OBJECTID",
-                "equals": "`test`.`t2`.`ID`",
-                "null_rejecting": true
-              },
-              {
-                "database": "test",
-                "table": "t2",
-                "field": "ID",
-                "equals": "`test`.`t1`.`OBJECTID`",
-                "null_rejecting": false
-              },
-              {
-                "database": "test",
-                "table": "t2",
-                "field": "ID",
-                "equals": "`test`.`t3`.`ID`",
-                "null_rejecting": true
-              },
-              {
-                "database": "test",
-                "table": "t3",
-                "field": "ID",
-                "equals": "`test`.`t1`.`OBJECTID`",
-                "null_rejecting": false
-              },
-              {
-                "database": "test",
-                "table": "t3",
-                "field": "ID",
-                "equals": "`test`.`t2`.`ID`",
-                "null_rejecting": true
-              }
-            ] /* ref_optimizer_key_uses */
+              ] /* steps */,
+              "empty_result": {
+                "cause": "no matching row in const table"
+              } /* empty_result */
+            } /* join_optimization */
           },
           {
             "records_estimation": [
               {
-                "database": "test",
-                "table": "t1",
-                "records": 1,
-                "cost": 1,
-                "table_type": "system"
-              },
-              {
-                "database": "test",
-                "table": "t2",
-                "const_keys_added": {
-                  "keys": [
-                    "t2_PARID_IDX"
-                  ] /* keys */,
-                  "cause": "group_by"
-                } /* const_keys_added */,
-                "range_analysis": {
-                  "table_scan": {
-                    "records": 9,
-                    "cost": 5.9198
-                  } /* table_scan */,
-                  "potential_range_indices": [
-                    {
-                      "index": "t2_ID_IDX",
-                      "usable": false,
-                      "cause": "not_applicable"
-                    },
-                    {
-                      "index": "t2_PARID_IDX",
-                      "usable": true,
-                      "key_parts": [
-                        "PARID"
-                      ] /* key_parts */
-                    }
-                  ] /* potential_range_indices */,
-                  "setup_range_conditions": [
-                  ] /* setup_range_conditions */,
-                  "group_index_range": {
-                    "chosen": false,
-                    "cause": "not_single_table"
-                  } /* group_index_range */
-                } /* range_analysis */
-              },
-              {
-                "database": "test",
-                "table": "t3",
-                "const_keys_added": {
-                  "keys": [
-                  ] /* keys */,
-                  "cause": "group_by"
-                } /* const_keys_added */,
-                "range_analysis": {
-                  "table_scan": {
-                    "records": 8,
-                    "cost": 5.7195
-                  } /* table_scan */
-                } /* range_analysis */
+                "database": "",
+                "table": "tmp",
+                "table_scan": {
+                  "records": 2,
+                  "cost": 10
+                } /* table_scan */
               }
             ] /* records_estimation */
           },
           {
             "considered_execution_plans": [
               {
-                "database": "test",
-                "table": "t3",
+                "database": "",
+                "table": "tmp",
                 "best_access_path": {
                   "considered_access_paths": [
                     {
-                      "access_type": "ref",
-                      "index": "t3_ID_IDX",
-                      "records": 0.8,
-                      "cost": 0.96,
-                      "chosen": true
-                    },
-                    {
                       "access_type": "scan",
-                      "cost": 2,
-                      "records": 8,
-                      "cause": "cost",
-                      "chosen": false
-                    }
-                  ] /* considered_access_paths */
-                } /* best_access_path */,
-                "cost_for_plan": 0.96,
-                "records_for_plan": 0.8,
-                "rest_of_plan": [
-                  {
-                    "database": "test",
-                    "table": "t2",
-                    "best_access_path": {
-                      "considered_access_paths": [
-                        {
-                          "access_type": "ref",
-                          "index": "t2_ID_IDX",
-                          "records": 2,
-                          "cost": 2,
-                          "chosen": true
-                        },
-                        {
-                          "access_type": "scan",
-                          "cost": 2,
-                          "records": 9,
-                          "cause": "cost",
-                          "chosen": false
-                        }
-                      ] /* considered_access_paths */
-                    } /* best_access_path */,
-                    "added_to_eq_ref_extension": false
-                  },
-                  {
-                    "database": "test",
-                    "table": "t2",
-                    "best_access_path": {
-                      "considered_access_paths": [
-                        {
-                          "access_type": "ref",
-                          "index": "t2_ID_IDX",
-                          "records": 2,
-                          "cost": 2,
-                          "chosen": true
-                        },
-                        {
-                          "access_type": "scan",
-                          "cost": 2,
-                          "records": 9,
-                          "cause": "cost",
-                          "chosen": false
-                        }
-                      ] /* considered_access_paths */
-                    } /* best_access_path */,
-                    "cost_for_plan": 2.88,
-                    "records_for_plan": 1.6,
-                    "chosen": true
-                  }
-                ] /* rest_of_plan */
-              },
-              {
-                "database": "test",
-                "table": "t2",
-                "best_access_path": {
-                  "considered_access_paths": [
-                    {
-                      "access_type": "ref",
-                      "index": "t2_ID_IDX",
-                      "records": 0.9,
-                      "cost": 1.08,
+                      "records": 2,
+                      "cost": 10.1,
                       "chosen": true
-                    },
-                    {
-                      "access_type": "scan",
-                      "cost": 2,
-                      "records": 9,
-                      "cause": "cost",
-                      "chosen": false
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 1.08,
-                "records_for_plan": 0.9,
-                "pruned_by_heuristic": true
+                "cost_for_plan": 10.5,
+                "records_for_plan": 2,
+                "chosen": true
               }
             ] /* considered_execution_plans */
-          }
-        ] /* steps */,
-        "empty_result": {
-          "cause": "no matching row in const table"
-        } /* empty_result */
-      } /* join_optimization */
-    },
-    {
-      "join_execution": {
-        "select#": 2,
-        "steps": [
-        ] /* steps */
-      } /* join_execution */
-    },
-    {
-      "join_preparation": {
-        "select#": 1,
-        "steps": [
+          },
           {
-            "expanded_query": "/* select#1 */ select 497 AS `497`,`tmp`.`ID` AS `ID`,NULL AS `NULL` from (/* select#2 */ select 497 AS `ID`,max(`test`.`t3`.`DATA`) AS `DATA` from `test`.`t1` join `test`.`t2` join `test`.`t3` where multiple equal(NULL, `test`.`t3`.`ID`, `test`.`t2`.`ID`) group by `test`.`t2`.`PARID` order by max(`test`.`t3`.`DATA`) desc) `tmp`"
-          }
-        ] /* steps */
-      } /* join_preparation */
-    },
-    {
-      "join_optimization": {
-        "select#": 1,
-        "steps": [
+            "attaching_conditions_to_tables": {
+              "original_condition": null,
+              "attached_conditions_computation": [
+              ] /* attached_conditions_computation */,
+              "attached_conditions_summary": [
+                {
+                  "database": "",
+                  "table": "tmp",
+                  "attached": null
+                }
+              ] /* attached_conditions_summary */
+            } /* attaching_conditions_to_tables */
+          },
           {
-            "records_estimation": [
+            "refine_plan": [
               {
                 "database": "",
                 "table": "tmp",
-                "records": 1,
-                "cost": 1,
-                "table_type": "system"
+                "scan_type": "table"
               }
-            ] /* records_estimation */
+            ] /* refine_plan */
           }
-        ] /* steps */,
-        "empty_result": {
-          "cause": "no matching row in const table"
-        } /* empty_result */
+        ] /* steps */
       } /* join_optimization */
     },
     {
       "join_execution": {
         "select#": 1,
         "steps": [
+          {
+            "join_execution": {
+              "select#": 2,
+              "steps": [
+              ] /* steps */
+            } /* join_execution */
+          }
         ] /* steps */
       } /* join_execution */
     }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (evgeny.potemkin:3017 to 3018) Evgeny Potemkin16 Aug