From: Marc Alff Date: August 20 2011 12:37am Subject: bzr push into mysql-trunk branch (marc.alff:3395 to 3396) List-Archive: http://lists.mysql.com/commits/140737 Message-Id: <201108200036.p7K0axNl016112@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3396 Marc Alff 2011-08-20 Branch cleanup modified: .bzr-mysql/default.conf 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/t/socket_summary_by_instance_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test sql/mysqld.cc 3395 Marc Alff 2011-08-20 [merge] Merge mysql-trunk --> mysql-trunk-wl4896 added: mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test mysql-test/include/not_mts_slave_parallel_workers.inc mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result.THIS 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_mts_check_concurrency.result mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_parallel_benchmark.result mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result mysql-test/suite/rpl/r/rpl_parallel_conflicts.result mysql-test/suite/rpl/r/rpl_parallel_ddl.result mysql-test/suite/rpl/r/rpl_parallel_fallback.result mysql-test/suite/rpl/r/rpl_parallel_innodb.result mysql-test/suite/rpl/r/rpl_parallel_multi_db.result mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result mysql-test/suite/rpl/r/rpl_parallel_temp_query.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_sequential.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/rpl/t/rpl_mixed_crash_safe-slave.opt.THIS mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test.THIS mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test mysql-test/suite/rpl/t/rpl_mts_check_concurrency-slave.opt mysql-test/suite/rpl/t/rpl_mts_check_concurrency.test mysql-test/suite/rpl/t/rpl_parallel-master.opt mysql-test/suite/rpl/t/rpl_parallel-slave.opt mysql-test/suite/rpl/t/rpl_parallel.test mysql-test/suite/rpl/t/rpl_parallel_benchmark-master.opt mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt mysql-test/suite/rpl/t/rpl_parallel_benchmark.test mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt mysql-test/suite/rpl/t/rpl_parallel_conflicts.test mysql-test/suite/rpl/t/rpl_parallel_ddl-slave.opt mysql-test/suite/rpl/t/rpl_parallel_ddl.test mysql-test/suite/rpl/t/rpl_parallel_innodb-master.opt mysql-test/suite/rpl/t/rpl_parallel_innodb-slave.opt mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt mysql-test/suite/rpl/t/rpl_parallel_multi_db-slave.opt mysql-test/suite/rpl/t/rpl_parallel_multi_db.test mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master-slave.opt mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_parallel_switch_sequential-slave.opt mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test mysql-test/suite/rpl/t/rpl_parallel_temp_query-slave.opt mysql-test/suite/rpl/t/rpl_parallel_temp_query.test mysql-test/suite/rpl/t/rpl_row_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test mysql-test/suite/rpl/t/rpl_sequential-master.opt mysql-test/suite/rpl/t/rpl_sequential-slave.opt mysql-test/suite/rpl/t/rpl_sequential.test mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result mysql-test/suite/sys_vars/r/slave_checkpoint_period_basic.result mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result mysql-test/suite/sys_vars/t/slave_checkpoint_group_basic.test mysql-test/suite/sys_vars/t/slave_checkpoint_period_basic.test mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test sql/dynamic_ids.cc sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h renamed: sql/server_ids.h => sql/dynamic_ids.h modified: .bzr-mysql/default.conf client/mysqldump.c include/my_pthread.h mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/extra/rpl_tests/rpl_crash_safe.test mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/extra/rpl_tests/rpl_relayrotate.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-test/include/mtr_warnings.sql mysql-test/include/wait_for_slave_param.inc mysql-test/r/1st.result mysql-test/r/connect.result mysql-test/r/information_schema.result mysql-test/r/log_tables_upgrade.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/plugin_auth.result mysql-test/r/system_mysql_db.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-test/suite/funcs_1/r/is_statistics.result mysql-test/suite/funcs_1/r/is_statistics_mysql.result mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_relayrotate.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_colSize.result mysql-test/suite/rpl/r/rpl_row_conflicts.result mysql-test/suite/rpl/r/rpl_row_corruption.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/r/rpl_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_start.result mysql-test/suite/rpl/r/rpl_stm_000001.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_bug26395.test mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_cross_version.test mysql-test/suite/rpl/t/rpl_deadlock_innodb.test mysql-test/suite/rpl/t/rpl_dual_pos_advance.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.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_loaddata_fatal.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_colSize.test mysql-test/suite/rpl/t/rpl_row_corruption.test mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-test/suite/rpl/t/rpl_row_event_max_size.test mysql-test/suite/rpl/t/rpl_row_idempotency.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test mysql-test/suite/rpl/t/rpl_row_mixing_engines.test mysql-test/suite/rpl/t/rpl_row_until.test mysql-test/suite/rpl/t/rpl_seconds_behind_master.test mysql-test/suite/rpl/t/rpl_server_id2.test mysql-test/suite/rpl/t/rpl_show_errors.test mysql-test/suite/rpl/t/rpl_slave_grp_exec.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_slave_start.test mysql-test/suite/rpl/t/rpl_stm_000001.test mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test mysql-test/suite/rpl/t/rpl_temporary_errors.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/system_mysql_db_fix40123.test mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test scripts/mysql_system_tables.sql sql/CMakeLists.txt sql/binlog.cc sql/binlog.h sql/event_parse_data.cc sql/events.cc sql/field.cc sql/lock.cc sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/rpl_info.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_info_factory.h sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_info_table_access.h sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_reporting.cc sql/rpl_reporting.h sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_slave.cc sql/rpl_slave.h sql/share/errmsg-utf8.txt sql/sp.cc sql/sql_acl.cc sql/sql_base.cc sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_rename.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_view.cc sql/sys_vars.cc sql/table.cc sql/table.h storage/blackhole/ha_blackhole.cc support-files/mysql.spec.sh sql/dynamic_ids.h === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2011-08-20 00:25:14 +0000 +++ b/.bzr-mysql/default.conf 2011-08-20 00:36:03 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-next-mr-wl5569" +tree_name = "mysql-trunk" === modified file 'mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result' --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result 2011-08-19 16:38:25 +0000 +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result 2011-08-20 00:36:03 +0000 @@ -41,7 +41,7 @@ DROP USER 'root012345'@'localhost'; # length of default db = 9 character GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost'; DROP USER 'root0123456789'@'localhost'; -# 2.7 Connect should pass, host = ::ffff:127.0.0.1 +# 2.7 Connect should pass, host = my_localhost # length of user name = 4 character # length of default db = 9 character # connection runs through server_tcpip_socket ! === modified file 'mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result' --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result 2011-08-19 08:08:08 +0000 +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result 2011-08-20 00:36:03 +0000 @@ -41,10 +41,11 @@ DROP USER 'root012345'@'localhost'; # length of default db = 9 character GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost'; DROP USER 'root0123456789'@'localhost'; -# 2.7 Connect should pass, host = 127.0.0.1 +# 2.7 Connect should pass, host = my_localhost # length of user name = 4 character # length of default db = 9 character # connection runs through server_tcpip_socket ! +DO 1; # 3 Variations on SELECT # 3.1 Check a SELECT ending with server sending an error message. # Error message is short (unknown table). === modified file 'mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test' --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test 2011-08-19 16:38:25 +0000 +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test 2011-08-20 00:36:03 +0000 @@ -535,7 +535,7 @@ let $connect_user= root0123456789; --source ../include/socket_event.inc DROP USER 'root0123456789'@'localhost'; ---echo # 2.7 Connect should pass, host = $my_localhost +--echo # 2.7 Connect should pass, host = my_localhost --echo # length of user name = 4 character --echo # length of default db = 9 character --echo # connection runs through server_tcpip_socket ! === modified file 'mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test' --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test 2011-08-19 16:38:25 +0000 +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test 2011-08-20 00:36:03 +0000 @@ -538,7 +538,7 @@ let $connect_user= root0123456789; --source ../include/socket_event.inc DROP USER 'root0123456789'@'localhost'; ---echo # 2.7 Connect should pass, host = $my_localhost +--echo # 2.7 Connect should pass, host = my_localhost --echo # length of user name = 4 character --echo # length of default db = 9 character --echo # connection runs through server_tcpip_socket ! === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2011-08-20 00:25:14 +0000 +++ b/sql/mysqld.cc 2011-08-20 00:36:03 +0000 @@ -5681,7 +5681,7 @@ void handle_connections_sockets() { struct request_info req; signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, mysql_socket_getfd(new_sock), NULL); //TBD cwp + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, mysql_socket_getfd(new_sock), NULL); my_fromhost(&req); if (!my_hosts_access(&req)) No bundle (reason: useless for push emails).