From: Marc Alff Date: August 10 2011 4:29pm Subject: bzr push into mysql-trunk branch (marc.alff:3264 to 3266) List-Archive: http://lists.mysql.com/commits/140579 Message-Id: <201108101629.p7AGTbor015569@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3266 Marc Alff 2011-08-10 Fixed tree name modified: .bzr-mysql/default.conf 3265 Marc Alff 2011-08-10 [merge] Merge mysql-trunk-wl5378 --> mysql-trunk-stage added: 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/pfs_upgrade_lc0.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result.THIS mysql-test/suite/perfschema/r/schema_lc0.result.THIS mysql-test/suite/perfschema/r/schema_lc1.result.THIS mysql-test/suite/perfschema/r/schema_lc2.result.THIS 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/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/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 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: .bzr-mysql/default.conf mysql-test/r/information_schema.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.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/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/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/start_server_nothing-master.opt mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/t/information_schema.test mysys/my_thr_init.c scripts/mysql_system_tables.sql sql/sys_vars.cc 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 3264 Marc Alff 2011-08-10 [merge] Merge mysql-trunk (revno 3355) --> mysql-trunk-stage added: mysql-test/include/have_optimizer_trace.inc 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/stage_cleanup.inc mysql-test/suite/perfschema/include/stage_setup.inc 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/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/sys_vars/r/innodb_file_format_max_basic.result mysql-test/suite/sys_vars/r/innodb_random_read_ahead_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/innodb_undo_directory_basic.result mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_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/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_random_read_ahead_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/innodb_undo_directory_basic.test mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_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 sql/opt_trace.cc sql/opt_trace.h sql/opt_trace2server.cc sql/opt_trace_Doxyfile sql/opt_trace_context.h 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/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_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/examples/CMakeLists.txt libmysqld/lib_sql.cc mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/include/icp_tests.inc mysql-test/include/mix1.inc mysql-test/include/mrr_tests.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_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_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_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/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_mysql.result mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-zip.test 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/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/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/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_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/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/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_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_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/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/setup_objects.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_row_reset_slave.result mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 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_math.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/implicit_commit.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 mysys/array.c mysys/my_alloc.c mysys/my_getopt.c mysys/my_init.c mysys/my_malloc.c mysys/my_static.c mysys/mysys_priv.h mysys/thr_lock.c plugin/semisync/semisync_master.cc plugin/semisync/semisync_master.h plugin/semisync/semisync_master_plugin.cc 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_mi.cc sql/rpl_mi.h sql/rpl_record.cc sql/rpl_reporting.cc sql/rpl_rli.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_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_profile.cc 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/buf/buf0buf.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0crea.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/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0lru.h storage/innobase/include/buf0rea.h storage/innobase/include/os0file.h storage/innobase/include/os0file.ic storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0rseg.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/include/ut0ut.h storage/innobase/lock/lock0lock.c storage/innobase/log/log0recv.c storage/innobase/os/os0file.c storage/innobase/read/read0read.c storage/innobase/row/row0ins.c storage/innobase/row/row0purge.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/srv/srv0start.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/innobase/ut/ut0ut.c storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_open.c storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_setup_actor.cc storage/perfschema/pfs_setup_object.cc strings/decimal.c support-files/mysql.spec.sh unittest/gunit/CMakeLists.txt unittest/gunit/my_decimal-t.cc 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 Diff too large for email (103936 lines, the limit is 10000). No bundle (reason: useless for push emails).