From: Marc Alff Date: November 9 2010 8:18am Subject: bzr push into mysql-next-mr branch (marc.alff:3371 to 3372) List-Archive: http://lists.mysql.com/commits/123182 Message-Id: <201011090819.oA8Dctut030262@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3372 Marc Alff 2010-11-09 [merge] Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing modified: mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/setup_helper.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc mysql-test/suite/perfschema/include/table_io_result_helper.inc mysql-test/suite/perfschema/include/table_io_setup_helper.inc mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result 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/ddl_cond_instances.result mysql-test/suite/perfschema/r/ddl_events_waits_current.result mysql-test/suite/perfschema/r/ddl_events_waits_history.result mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result mysql-test/suite/perfschema/r/ddl_ews_by_instance.result mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result mysql-test/suite/perfschema/r/ddl_file_instances.result mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result mysql-test/suite/perfschema/r/ddl_fs_by_instance.result mysql-test/suite/perfschema/r/ddl_mutex_instances.result mysql-test/suite/perfschema/r/ddl_performance_timers.result mysql-test/suite/perfschema/r/ddl_rwlock_instances.result mysql-test/suite/perfschema/r/ddl_setup_actors.result mysql-test/suite/perfschema/r/ddl_setup_consumers.result mysql-test/suite/perfschema/r/ddl_setup_instruments.result mysql-test/suite/perfschema/r/ddl_setup_timers.result mysql-test/suite/perfschema/r/dml_cond_instances.result mysql-test/suite/perfschema/r/dml_events_waits_current.result mysql-test/suite/perfschema/r/dml_events_waits_history.result mysql-test/suite/perfschema/r/dml_events_waits_history_long.result mysql-test/suite/perfschema/r/dml_ews_by_instance.result mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result mysql-test/suite/perfschema/r/dml_file_instances.result mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result mysql-test/suite/perfschema/r/dml_mutex_instances.result mysql-test/suite/perfschema/r/dml_performance_timers.result mysql-test/suite/perfschema/r/dml_rwlock_instances.result mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/dml_threads.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/r/global_read_lock.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/misc.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/no_threads.result mysql-test/suite/perfschema/r/one_thread_per_con.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/read_only.result mysql-test/suite/perfschema/r/rollback_table_io.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/schema_lc2.result mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/r/setup_actors.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/r/tampered_perfschema_table1.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/aggregate.test mysql-test/suite/perfschema/t/checksum.test mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/csv_table_io.test mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-test/suite/perfschema/t/ddl_setup_actors.test mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-test/suite/perfschema/t/ddl_setup_timers.test mysql-test/suite/perfschema/t/disabled.def mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_performance_timers.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_setup_consumers.test mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/dml_threads.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/global_read_lock.test mysql-test/suite/perfschema/t/indexed_table_io.test mysql-test/suite/perfschema/t/information_schema.test mysql-test/suite/perfschema/t/innodb_table_io.test mysql-test/suite/perfschema/t/memory_table_io.test mysql-test/suite/perfschema/t/merge_table_io.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/perfschema/t/multi_table_io.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/myisam_table_io.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/perfschema/t/part_table_io.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/privilege_table_io.test mysql-test/suite/perfschema/t/query_cache.test mysql-test/suite/perfschema/t/read_only.test mysql-test/suite/perfschema/t/rollback_table_io.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/perfschema/t/setup_actors.test mysql-test/suite/perfschema/t/start_server_no_cond_class.test mysql-test/suite/perfschema/t/start_server_no_cond_inst.test mysql-test/suite/perfschema/t/start_server_no_file_class.test mysql-test/suite/perfschema/t/start_server_no_file_inst.test mysql-test/suite/perfschema/t/start_server_no_mutex_class.test mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test mysql-test/suite/perfschema/t/start_server_no_thread_class.test mysql-test/suite/perfschema/t/start_server_no_thread_inst.test mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/suite/perfschema/t/tampered_perfschema_table1.test mysql-test/suite/perfschema/t/temp_table_io.test mysql-test/suite/perfschema/t/thread_cache.test mysql-test/suite/perfschema/t/trigger_table_io.test mysql-test/suite/perfschema/t/view_table_io.test scripts/mysql_system_tables.sql storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_file_instances.cc storage/perfschema/table_file_summary.cc storage/perfschema/table_performance_timers.cc storage/perfschema/table_setup_actors.cc storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_timers.cc storage/perfschema/table_sync_instances.cc 3371 Dao-Gang.Qu@stripped 2010-11-09 Bug #55790 Read_Master_Log_Pos is wrong after Slave_IO_Error= ER_NET_PACKET_TOO_LARGE Post fix. @ mysql-test/suite/rpl/t/rpl_packet.test Updated for bug#55790 modified: mysql-test/suite/rpl/t/rpl_packet.test Diff too large for email (11380 lines, the limit is 10000). No bundle (reason: useless for push emails).