From: Andrei Elkin Date: August 22 2011 6:22am Subject: bzr push into mysql-trunk branch (andrei.elkin:3394 to 3395) WL#5569 List-Archive: http://lists.mysql.com/commits/140768 Message-Id: <201108220622.p7M6MxlZ002976@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3395 Andrei Elkin 2011-08-22 wl#5569 MTS post-push changes to fix three tests result mismatch, building on werror and restoring sys_vars.all_vars out of disabled.def. @ mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result results updated. @ mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result results updated. @ mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result results updated. @ mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result results updated. @ mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result results updated. @ mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result results updated. @ mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result results updated. @ mysql-test/suite/sys_vars/t/disabled.def restoring the trunk version of the file. @ sql/log_event.cc Wrapping THD thd declaration with DBUG_OFF to please werror. modified: mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/sys_vars/t/disabled.def sql/log_event.cc 3394 Marc Alff 2011-08-20 [merge] WL#4896 PERFORMANCE_SCHEMA NET IO Merge mysql-trunk-wl4896 --> mysql-trunk added: include/mysql/psi/mysql_idle.h include/mysql/psi/mysql_socket.h mysql-test/include/check_ipv4_mapped.inc mysql-test/suite/perfschema/include/socket_check1.inc mysql-test/suite/perfschema/include/socket_event.inc mysql-test/suite/perfschema/include/socket_event_dbg.inc mysql-test/suite/perfschema/include/socket_ipv6.inc mysql-test/suite/perfschema/include/socket_summary_check.inc mysql-test/suite/perfschema/include/socket_summary_check_dbg.inc mysql-test/suite/perfschema/include/wait_till_sleep.inc mysql-test/suite/perfschema/r/ddl_socket_instances.result mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result mysql-test/suite/perfschema/r/dml_handler.result mysql-test/suite/perfschema/r/dml_socket_instances.result mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result mysql-test/suite/perfschema/r/socket_connect.result mysql-test/suite/perfschema/r/socket_instances_func.result mysql-test/suite/perfschema/r/socket_instances_func_win.result mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result mysql-test/suite/perfschema/r/start_server_no_socket_class.result mysql-test/suite/perfschema/r/start_server_no_socket_inst.result mysql-test/suite/perfschema/t/ddl_socket_instances.test mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test mysql-test/suite/perfschema/t/dml_handler.test mysql-test/suite/perfschema/t/dml_socket_instances.test mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test mysql-test/suite/perfschema/t/socket_connect.test mysql-test/suite/perfschema/t/socket_instances_func-master.opt mysql-test/suite/perfschema/t/socket_instances_func.test mysql-test/suite/perfschema/t/socket_instances_func_win-master.opt mysql-test/suite/perfschema/t/socket_instances_func_win.test mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test mysql-test/suite/perfschema/t/start_server_no_socket_class-master.opt mysql-test/suite/perfschema/t/start_server_no_socket_class.test mysql-test/suite/perfschema/t/start_server_no_socket_inst-master.opt mysql-test/suite/perfschema/t/start_server_no_socket_inst.test mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result mysql-test/suite/sys_vars/r/pfs_max_socket_instances_basic.result mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic.test storage/perfschema/table_socket_instances.cc storage/perfschema/table_socket_instances.h storage/perfschema/table_socket_summary_by_event_name.cc storage/perfschema/table_socket_summary_by_event_name.h storage/perfschema/table_socket_summary_by_instance.cc storage/perfschema/table_socket_summary_by_instance.h modified: .bzr-mysql/default.conf include/mysql.h.pp 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 include/violite.h mysql-test/include/mtr_check.sql 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/aggregate.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/dml_setup_timers.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.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.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_account.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_host.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_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/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/aggregate.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/ortho_iter.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 mysys/psi_noop.cc scripts/mysql_system_tables.sql sql-common/client.c sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/sql_class.cc sql/sql_connect.cc sql/sql_parse.cc sql/sys_vars.cc storage/perfschema/CMakeLists.txt storage/perfschema/ha_perfschema.cc 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.h storage/perfschema/pfs_global.cc storage/perfschema/pfs_global.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_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_by_account_by_event_name.cc storage/perfschema/table_ews_by_host_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_user_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_helper.h 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_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc vio/vio.c vio/viopipe.c vio/vioshm.c vio/viosocket.c vio/viossl.c === modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result' --- a/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result 2011-08-19 18:13:59 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,8 +306,10 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; Table Create Table slave_relay_log_info CREATE TABLE `slave_relay_log_info` ( @@ -320,7 +322,7 @@ slave_relay_log_info CREATE TABLE `slave `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.', `Number_of_workers` int(10) unsigned NOT NULL, PRIMARY KEY (`Master_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Relay Log Information' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information' SHOW CREATE TABLE mysql.slave_worker_info; Table Create Table slave_worker_info CREATE TABLE `slave_worker_info` ( @@ -338,7 +340,7 @@ slave_worker_info CREATE TABLE `slave_wo `Checkpoint_group_size` int(10) unsigned NOT NULL, `Checkpoint_group_bitmap` blob NOT NULL, PRIMARY KEY (`Master_id`,`Worker_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Worker Information' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information' ALTER TABLE mysql.slave_master_info ENGINE= Innodb; ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb; ALTER TABLE mysql.slave_worker_info ENGINE= Innodb; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result' --- a/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result 2011-08-19 13:04:28 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result 2011-08-22 06:14:59 +0000 @@ -306,6 +306,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; @@ -366,6 +368,8 @@ slave_master_info CREATE TABLE `slave_ma `Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', `Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', `Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', + `Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', + `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', PRIMARY KEY (`Master_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information' SHOW CREATE TABLE mysql.slave_relay_log_info; === modified file 'mysql-test/suite/sys_vars/t/disabled.def' --- a/mysql-test/suite/sys_vars/t/disabled.def 2011-08-20 00:25:14 +0000 +++ b/mysql-test/suite/sys_vars/t/disabled.def 2011-08-22 06:14:59 +0000 @@ -14,5 +14,3 @@ query_cache_size_basic_64 : Bu transaction_prealloc_size_basic_32 : Bug#11748572 transaction_prealloc_size_basic_64 : Bug#11748572 #thread_cache_size_func : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads - -all_vars : bug#12664445 Fri Jun 17 20:40:24 EEST 2011 andrei === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2011-08-19 13:04:28 +0000 +++ b/sql/log_event.cc 2011-08-22 06:14:59 +0000 @@ -2411,8 +2411,10 @@ Slave_worker *Log_event::get_slave_worke bool is_b_event; int num_dbs= 0; Slave_worker *ret_worker= NULL; - THD *thd= rli->info_thd; char llbuff[22]; +#ifndef DBUG_OFF + THD *thd= rli->info_thd; +#endif Slave_committed_queue *gaq= rli->gaq; /* checking partioning properties and perform corresponding actions */ No bundle (reason: useless for push emails).