From: Oystein Grovlen Date: March 31 2011 11:32am Subject: bzr commit into mysql-trunk branch (oystein.grovlen:3285) List-Archive: http://lists.mysql.com/commits/134352 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/og136792/mysql/mysql-next-mr-opt-backporting-wl4800/ based on revid:guilhem.bichot@stripped 3285 Oystein Grovlen 2011-03-31 [merge] merge mysq-next-mr-opt-backporting -> mysq-next-mr-opt-backporting-wl4800 added: include/mysql/psi/mysql_stage.h include/mysql/psi/mysql_statement.h mysql-test/include/not_crashrep.inc mysql-test/r/tablespace.result mysql-test/std_data/cluster_7022_table.MYD mysql-test/std_data/cluster_7022_table.MYI mysql-test/std_data/cluster_7022_table.frm mysql-test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result mysql-test/suite/perfschema/r/ddl_esgs_global_by_event_name.result mysql-test/suite/perfschema/r/ddl_esms_by_thread_by_event_name.result mysql-test/suite/perfschema/r/ddl_esms_global_by_event_name.result mysql-test/suite/perfschema/r/ddl_events_stages_current.result mysql-test/suite/perfschema/r/ddl_events_stages_history.result mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result mysql-test/suite/perfschema/r/ddl_events_statements_current.result mysql-test/suite/perfschema/r/ddl_events_statements_history.result mysql-test/suite/perfschema/r/ddl_events_statements_history_long.result mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result mysql-test/suite/perfschema/r/dml_events_stages_current.result mysql-test/suite/perfschema/r/dml_events_stages_history.result mysql-test/suite/perfschema/r/dml_events_stages_history_long.result mysql-test/suite/perfschema/r/dml_events_statements_current.result mysql-test/suite/perfschema/r/dml_events_statements_history.result mysql-test/suite/perfschema/r/dml_events_statements_history_long.result mysql-test/suite/perfschema/r/start_server_innodb.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/t/ddl_esgs_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_esgs_global_by_event_name.test mysql-test/suite/perfschema/t/ddl_esms_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_esms_global_by_event_name.test mysql-test/suite/perfschema/t/ddl_events_stages_current.test mysql-test/suite/perfschema/t/ddl_events_stages_history.test mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test mysql-test/suite/perfschema/t/ddl_events_statements_current.test mysql-test/suite/perfschema/t/ddl_events_statements_history.test mysql-test/suite/perfschema/t/ddl_events_statements_history_long.test mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test mysql-test/suite/perfschema/t/dml_events_stages_current.test mysql-test/suite/perfschema/t/dml_events_stages_history.test mysql-test/suite/perfschema/t/dml_events_stages_history_long.test mysql-test/suite/perfschema/t/dml_events_statements_current.test mysql-test/suite/perfschema/t/dml_events_statements_history.test mysql-test/suite/perfschema/t/dml_events_statements_history_long.test mysql-test/suite/perfschema/t/start_server_innodb-master.opt mysql-test/suite/perfschema/t/start_server_innodb.test mysql-test/suite/perfschema/t/start_server_no_stage_class-master.opt mysql-test/suite/perfschema/t/start_server_no_stage_class.test mysql-test/suite/perfschema/t/start_server_no_stages_history-master.opt mysql-test/suite/perfschema/t/start_server_no_stages_history.test mysql-test/suite/perfschema/t/start_server_no_stages_history_long-master.opt mysql-test/suite/perfschema/t/start_server_no_stages_history_long.test mysql-test/suite/perfschema/t/start_server_no_statement_class-master.opt mysql-test/suite/perfschema/t/start_server_no_statement_class.test mysql-test/suite/perfschema/t/start_server_no_statements_history-master.opt mysql-test/suite/perfschema/t/start_server_no_statements_history.test mysql-test/suite/perfschema/t/start_server_no_statements_history_long-master.opt mysql-test/suite/perfschema/t/start_server_no_statements_history_long.test mysql-test/suite/sys_vars/r/pfs_events_stages_history_long_size_basic.result mysql-test/suite/sys_vars/r/pfs_events_stages_history_size_basic.result mysql-test/suite/sys_vars/r/pfs_events_statements_history_long_size_basic.result mysql-test/suite/sys_vars/r/pfs_events_statements_history_size_basic.result mysql-test/suite/sys_vars/r/pfs_max_stage_classes_basic.result mysql-test/suite/sys_vars/r/pfs_max_statement_classes_basic.result mysql-test/suite/sys_vars/t/pfs_events_stages_history_long_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_stages_history_long_size_basic.test mysql-test/suite/sys_vars/t/pfs_events_stages_history_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_stages_history_size_basic.test mysql-test/suite/sys_vars/t/pfs_events_statements_history_long_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_statements_history_long_size_basic.test mysql-test/suite/sys_vars/t/pfs_events_statements_history_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_events_statements_history_size_basic.test mysql-test/suite/sys_vars/t/pfs_max_stage_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_stage_classes_basic.test mysql-test/suite/sys_vars/t/pfs_max_statement_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_statement_classes_basic.test mysql-test/t/tablespace.test storage/perfschema/pfs_con_slice.cc storage/perfschema/pfs_con_slice.h storage/perfschema/pfs_events.h 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/table_esgs_by_thread_by_event_name.cc storage/perfschema/table_esgs_by_thread_by_event_name.h storage/perfschema/table_esgs_global_by_event_name.cc storage/perfschema/table_esgs_global_by_event_name.h storage/perfschema/table_esms_by_thread_by_event_name.cc storage/perfschema/table_esms_by_thread_by_event_name.h storage/perfschema/table_esms_global_by_event_name.cc storage/perfschema/table_esms_global_by_event_name.h storage/perfschema/table_events_stages.cc storage/perfschema/table_events_stages.h storage/perfschema/table_events_statements.cc storage/perfschema/table_events_statements.h renamed: mysql-test/r/partition_not_embedded.result => mysql-test/r/partition_myisam.result mysql-test/t/partition_not_embedded.test => mysql-test/t/partition_myisam.test modified: .bzrignore client/mysqlbinlog.cc client/mysqltest.cc client/sql_string.cc client/sql_string.h include/my_global.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp include/mysql_com.h mysql-test/collections/default.daily mysql-test/collections/default.push mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/extra/rpl_tests/rpl_record_compare.test mysql-test/include/default_mysqld.cnf mysql-test/include/icp_tests.inc mysql-test/mysql-test-run.pl mysql-test/r/cast.result mysql-test/r/events_bugs.result mysql-test/r/func_math.result mysql-test/r/func_time.result mysql-test/r/func_weight_string.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_mysql_lock2.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/packet.result mysql-test/r/partition.result mysql-test/r/partition_error.result mysql-test/r/partition_explicit_prune.result mysql-test/r/partition_symlink.result mysql-test/r/ps.result mysql-test/r/shm.result mysql-test/r/sp-threads.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_jcl6.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/xa.result mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/binlog/t/binlog_variables_relay_log.test mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/funcs_1/t/is_engines_innodb.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/parts/r/partition-dml-1-1-innodb-modes.result mysql-test/suite/parts/r/partition-dml-1-1-myisam-modes.result mysql-test/suite/parts/r/partition-dml-1-10-innodb.result mysql-test/suite/parts/r/partition-dml-1-10-myisam.result mysql-test/suite/parts/r/partition-dml-1-8-innodb.result mysql-test/suite/parts/r/partition-dml-1-9-innodb.result mysql-test/suite/parts/r/partition-dml-1-9-myisam.result mysql-test/suite/parts/r/partition_char_innodb.result mysql-test/suite/parts/r/partition_char_myisam.result mysql-test/suite/parts/r/partition_datetime_innodb.result mysql-test/suite/parts/r/partition_datetime_myisam.result mysql-test/suite/parts/r/partition_decimal_innodb.result mysql-test/suite/parts/r/partition_decimal_myisam.result mysql-test/suite/parts/r/partition_float_innodb.result mysql-test/suite/parts/r/partition_float_myisam.result mysql-test/suite/parts/r/partition_recover_myisam.result mysql-test/suite/parts/r/partition_repair_myisam.result mysql-test/suite/parts/r/partition_special_innodb.result mysql-test/suite/parts/r/partition_special_myisam.result mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/checksum.result mysql-test/suite/perfschema/r/column_privilege.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/func_file_io.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_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/privilege.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_lc0.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.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_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/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/column_privilege.test mysql-test/suite/perfschema/t/privilege.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_grant.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/t/rpl_000017.test mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-test/suite/rpl/t/rpl_grant.test mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test mysql-test/suite/rpl/t/rpl_semi_sync_event.test mysql-test/suite/rpl/t/rpl_sync.test mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result mysql-test/suite/sys_vars/r/max_allowed_packet_func.result mysql-test/t/events_bugs.test mysql-test/t/flush2.test mysql-test/t/func_math.test mysql-test/t/func_time.test mysql-test/t/func_weight_string.test mysql-test/t/myisam_crash_before_flush_keys.test mysql-test/t/mysqlbinlog.test mysql-test/t/partition_error.test mysql-test/t/partition_symlink.test mysql-test/t/ps.test mysql-test/t/variables-notembedded.test mysql-test/t/variables.test mysql-test/t/xa.test plugin/fulltext/plugin_example.c scripts/mysql_system_tables.sql sql/debug_sync.h sql/event_db_repository.cc sql/field.cc sql/field.h sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_cond.cc sql/ha_ndbcluster_cond.h sql/handler.cc sql/handler.h sql/hash_filo.cc sql/hash_filo.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_geofunc.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_subselect.h sql/item_sum.cc sql/item_sum.h sql/item_timefunc.cc sql/item_timefunc.h sql/lock.cc sql/log.cc sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/opt_range.h sql/partition_info.cc sql/partition_info.h sql/procedure.cc sql/procedure.h sql/protocol.cc sql/protocol.h sql/records.cc sql/records.h sql/rpl_master.cc sql/rpl_slave.cc sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/set_var.h sql/share/errmsg-utf8.txt sql/sp_cache.cc sql/sp_cache.h 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_analyse.cc sql/sql_analyse.h sql/sql_base.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_crypt.cc sql/sql_crypt.h sql/sql_cursor.cc sql/sql_cursor.h sql/sql_delete.cc sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_list.cc sql/sql_list.h sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_prepare.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_udf.cc sql/sql_udf.h sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sys_vars.cc sql/table.cc sql/table.h sql/transaction.cc sql/transaction.h sql/tztime.cc sql/tztime.h sql/unireg.cc storage/archive/ha_archive.cc storage/archive/ha_archive.h storage/blackhole/ha_blackhole.cc storage/blackhole/ha_blackhole.h storage/csv/ha_tina.cc storage/csv/transparent_file.cc storage/example/ha_example.cc storage/example/ha_example.h storage/federated/ha_federated.cc storage/federated/ha_federated.h storage/heap/ha_heap.cc storage/heap/ha_heap.h storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h storage/perfschema/CMakeLists.txt storage/perfschema/ha_perfschema.cc storage/perfschema/ha_perfschema.h storage/perfschema/pfs.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.cc storage/perfschema/pfs_column_values.h storage/perfschema/pfs_engine_table.cc 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_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits.h storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_helper.cc storage/perfschema/table_helper.h storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_timers.cc 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_timer-t.cc strings/uctypedump.c tests/mysql_client_test.c mysql-test/r/partition_myisam.result mysql-test/t/partition_myisam.test Diff too large for email (33548 lines, the limit is 10000). No bundle (reason: revision is a merge).