From: Marc Alff Date: November 30 2010 2:17pm Subject: bzr push into mysql-trunk-stage branch (marc.alff:3208 to 3209) List-Archive: http://lists.mysql.com/commits/125510 Message-Id: <201011301418.oAUDGGQf024773@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3209 Marc Alff 2010-11-30 [merge] Merge mysql-trunk-wl4816 --> mysql-trunk-stage removed: Doxyfile-wl4895 mysql-test/suite/perfschema/r/schema.result added: Doxyfile-perfschema mysql-test/suite/perfschema/r/ddl_os_global_by_type.result mysql-test/suite/perfschema/r/ddl_setup_objects.result mysql-test/suite/perfschema/r/dml_os_global_by_type.result mysql-test/suite/perfschema/r/dml_setup_objects.result mysql-test/suite/perfschema/r/setup_objects.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/t/ddl_os_global_by_type.test mysql-test/suite/perfschema/t/ddl_setup_objects.test mysql-test/suite/perfschema/t/dml_os_global_by_type.test mysql-test/suite/perfschema/t/dml_setup_objects.test mysql-test/suite/perfschema/t/setup_objects.test mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt mysql-test/suite/perfschema/t/start_server_no_setup_objects.test mysql-test/suite/sys_vars/r/pfs_setup_objects_size_basic.result mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic.test storage/perfschema/pfs_setup_object.cc storage/perfschema/pfs_setup_object.h storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.h storage/perfschema/table_helper.cc storage/perfschema/table_os_global_by_type.cc storage/perfschema/table_os_global_by_type.h storage/perfschema/table_setup_objects.cc storage/perfschema/table_setup_objects.h storage/perfschema/unittest/stub_pfs_defaults.h storage/perfschema/unittest/stub_server_misc.h modified: .bzrignore mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/information_schema.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_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_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_stress/r/modify.result mysql-test/suite/perfschema_stress/r/read.result mysql-test/suite/perfschema_stress/t/modify.test mysql-test/suite/perfschema_stress/t/read.test mysql-test/suite/perfschema_stress/t/setup.test scripts/mysql_system_tables.sql sql/sys_vars.cc storage/perfschema/CMakeLists.txt storage/perfschema/Makefile.am storage/perfschema/pfs.cc storage/perfschema/pfs_defaults.cc 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/table_all_instr.cc storage/perfschema/table_all_instr.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits.h storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_events_waits_summary.h storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_file_summary.cc storage/perfschema/table_file_summary.h storage/perfschema/table_helper.h storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.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_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc 3208 Luis Soares 2010-11-24 [merge] WL#2540: automerge from feature tree to mysql-trunk-stage (merging on behalf of Andrei Elkin) Manual change ============= - .bzr-mysql/default.conf : changed tree name mysql-trunk --> mysql-trunk-stage added: mysql-test/collections/mysql-next-mr-wl2540.push mysql-test/collections/mysql-trunk.daily mysql-test/collections/mysql-trunk.weekly mysql-test/include/have_binlog_checksum_off.inc mysql-test/suite/binlog/r/binlog_checksum.result mysql-test/suite/binlog/t/binlog_checksum.test mysql-test/suite/rpl/extension/README.checksum mysql-test/suite/rpl/extension/checksum.pl mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_checksum_cache.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/t/rpl_checksum-master.opt mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_checksum_cache.test mysql-test/suite/rpl/t/rpl_corruption-master.opt mysql-test/suite/rpl/t/rpl_corruption-slave.opt mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/sys_vars/r/binlog_checksum_basic.result mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result mysql-test/suite/sys_vars/t/binlog_checksum_basic.test mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test modified: .bzr-mysql/default.conf client/mysqlbinlog.cc libmysqld/CMakeLists.txt libmysqld/Makefile.am mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_flsh_tbls.test mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/mtr_warnings.sql mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/suite/binlog/r/binlog_killed.result mysql-test/suite/binlog/r/binlog_old_versions.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/t/binlog_killed.test mysql-test/suite/binlog/t/binlog_old_versions.test mysql-test/suite/binlog/t/disabled.def mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_conflicts.result mysql-test/suite/rpl/r/rpl_server_uuid.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_change_master.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_server_uuid.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test mysql-test/suite/sys_vars/t/all_vars.test mysql-test/t/mysqlbinlog2.test sql/binlog.cc sql/binlog.h sql/log.cc sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_rli.cc sql/rpl_slave.cc sql/rpl_utility.cc sql/share/errmsg-utf8.txt sql/sql_binlog.cc sql/sql_class.h sql/sys_vars.cc sql/sys_vars.h Diff too large for email (15498 lines, the limit is 10000). No bundle (reason: useless for push emails).