From: Sergey Glukhov Date: November 11 2011 10:17am Subject: bzr push into mysql-trunk branch (sergey.glukhov:3599) List-Archive: http://lists.mysql.com/commits/141905 Message-Id: <201111111019.pABAJ0eR010251@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3599 Sergey Glukhov 2011-11-11 [merge] automerge added: mysql-test/suite/rpl/r/rpl_master_connection.result mysql-test/suite/rpl/t/rpl_master_connection-master.opt mysql-test/suite/rpl/t/rpl_master_connection-slave.opt mysql-test/suite/rpl/t/rpl_master_connection.test modified: mysql-test/include/mtr_warnings.sql mysql-test/r/auth_rpl.result mysql-test/r/rpl_mysqldump_slave.result mysql-test/suite/binlog/r/binlog_rewrite.result mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result mysql-test/suite/parts/r/rpl_partition.result mysql-test/suite/perfschema/r/relaylog.result mysql-test/suite/rpl/r/rpl_000010.result mysql-test/suite/rpl/r/rpl_000011.result mysql-test/suite/rpl/r/rpl_000013.result mysql-test/suite/rpl/r/rpl_000017.result mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/r/rpl_EE_err.result mysql-test/suite/rpl/r/rpl_LD_INFILE.result mysql-test/suite/rpl/r/rpl_alter.result mysql-test/suite/rpl/r/rpl_alter_db.result mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_auto_increment_11932.result mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_binlog_corruption.result mysql-test/suite/rpl/r/rpl_binlog_errors.result mysql-test/suite/rpl/r/rpl_binlog_grant.result mysql-test/suite/rpl/r/rpl_bit.result mysql-test/suite/rpl/r/rpl_bit_npk.result mysql-test/suite/rpl/r/rpl_blackhole.result mysql-test/suite/rpl/r/rpl_bug26395.result mysql-test/suite/rpl/r/rpl_bug31076.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_bug37426.result mysql-test/suite/rpl/r/rpl_bug38694.result mysql-test/suite/rpl/r/rpl_bug41902.result 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_change_master_dbug.result mysql-test/suite/rpl/r/rpl_charset.result mysql-test/suite/rpl/r/rpl_charset_sjis.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_checksum_cache.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_colSize.result mysql-test/suite/rpl/r/rpl_commit_after_flush.result mysql-test/suite/rpl/r/rpl_concurrency_error.result mysql-test/suite/rpl/r/rpl_conditional_comments.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/r/rpl_create_database.result mysql-test/suite/rpl/r/rpl_create_if_not_exists.result mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result mysql-test/suite/rpl/r/rpl_cross_version.result mysql-test/suite/rpl/r/rpl_current_user.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_delete_no_where.result mysql-test/suite/rpl/r/rpl_do_db_filter.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result mysql-test/suite/rpl/r/rpl_drop.result mysql-test/suite/rpl/r/rpl_drop_db.result mysql-test/suite/rpl/r/rpl_drop_temp.result mysql-test/suite/rpl/r/rpl_drop_view.result mysql-test/suite/rpl/r/rpl_dual_pos_advance.result mysql-test/suite/rpl/r/rpl_empty_master_host.result mysql-test/suite/rpl/r/rpl_err_ignoredtable.result mysql-test/suite/rpl/r/rpl_events.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.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_failed_optimize.result mysql-test/suite/rpl/r/rpl_filter_database.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_flush_logs.result mysql-test/suite/rpl/r/rpl_flushlog_loop.result mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result mysql-test/suite/rpl/r/rpl_free_items.result mysql-test/suite/rpl/r/rpl_general_log.result mysql-test/suite/rpl/r/rpl_geometry.result mysql-test/suite/rpl/r/rpl_get_lock.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_grant.result mysql-test/suite/rpl/r/rpl_grant_plugin.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_ignore_db_filter.result mysql-test/suite/rpl/r/rpl_ignore_grant.result mysql-test/suite/rpl/r/rpl_ignore_revoke.result mysql-test/suite/rpl/r/rpl_ignore_table.result mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result mysql-test/suite/rpl/r/rpl_ignore_table_update.result mysql-test/suite/rpl/r/rpl_incident.result mysql-test/suite/rpl/r/rpl_init_slave.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_innodb_bug28430.result mysql-test/suite/rpl/r/rpl_innodb_bug30888.result mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_insert.result mysql-test/suite/rpl/r/rpl_insert_id.result mysql-test/suite/rpl/r/rpl_insert_id_pk.result mysql-test/suite/rpl/r/rpl_insert_ignore.result mysql-test/suite/rpl/r/rpl_invoked_features.result mysql-test/suite/rpl/r/rpl_ip_mix.result mysql-test/suite/rpl/r/rpl_ip_mix2.result mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result mysql-test/suite/rpl/r/rpl_ipv6.result mysql-test/suite/rpl/r/rpl_killed_ddl.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_charset.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_loaddata_m.result mysql-test/suite/rpl/r/rpl_loaddata_map.result mysql-test/suite/rpl/r/rpl_loaddata_s.result mysql-test/suite/rpl/r/rpl_loaddata_simple.result mysql-test/suite/rpl/r/rpl_loaddata_symlink.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_loadfile.result mysql-test/suite/rpl/r/rpl_locale.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_many_optimize.result mysql-test/suite/rpl/r/rpl_master_pos_wait.result mysql-test/suite/rpl/r/rpl_migration_crash_safe.result mysql-test/suite/rpl/r/rpl_misc_functions.result mysql-test/suite/rpl/r/rpl_mix_found_rows.result mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result 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_multi_delete.result mysql-test/suite/rpl/r/rpl_multi_delete2.result mysql-test/suite/rpl/r/rpl_multi_engine.result mysql-test/suite/rpl/r/rpl_multi_update.result mysql-test/suite/rpl/r/rpl_multi_update2.result mysql-test/suite/rpl/r/rpl_multi_update3.result mysql-test/suite/rpl/r/rpl_multi_update4.result mysql-test/suite/rpl/r/rpl_mysql_upgrade.result mysql-test/suite/rpl/r/rpl_name_const.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_nondeterministic_functions.result mysql-test/suite/rpl/r/rpl_not_null_innodb.result mysql-test/suite/rpl/r/rpl_not_null_myisam.result mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/r/rpl_packet.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_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_partition_archive.result mysql-test/suite/rpl/r/rpl_partition_innodb.result mysql-test/suite/rpl/r/rpl_partition_memory.result mysql-test/suite/rpl/r/rpl_partition_myisam.result mysql-test/suite/rpl/r/rpl_plugin_load.result mysql-test/suite/rpl/r/rpl_ps.result mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result mysql-test/suite/rpl/r/rpl_read_only.result mysql-test/suite/rpl/r/rpl_relay_space_innodb.result mysql-test/suite/rpl/r/rpl_relay_space_myisam.result mysql-test/suite/rpl/r/rpl_relayrotate.result mysql-test/suite/rpl/r/rpl_relayspace.result mysql-test/suite/rpl/r/rpl_replicate_do.result mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result mysql-test/suite/rpl/r/rpl_report.result mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result mysql-test/suite/rpl/r/rpl_rewrt_db.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result mysql-test/suite/rpl/r/rpl_row_001.result mysql-test/suite/rpl/r/rpl_row_4_bytes.result mysql-test/suite/rpl/r/rpl_row_NOW.result mysql-test/suite/rpl/r/rpl_row_USER.result mysql-test/suite/rpl/r/rpl_row_UUID.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.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_basic_8partition.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_blob_innodb.result mysql-test/suite/rpl/r/rpl_row_blob_myisam.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_delayed_ins.result mysql-test/suite/rpl/r/rpl_row_drop.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/r/rpl_row_find_row.result mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result mysql-test/suite/rpl/r/rpl_row_func001.result mysql-test/suite/rpl/r/rpl_row_func002.result mysql-test/suite/rpl/r/rpl_row_func003.result mysql-test/suite/rpl/r/rpl_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_img_blobs.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_eng_min.result mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result mysql-test/suite/rpl/r/rpl_row_img_idx_full.result mysql-test/suite/rpl/r/rpl_row_img_idx_min.result mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result mysql-test/suite/rpl/r/rpl_row_img_misc.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_insert_delayed.result mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_max_relay_size.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.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_row_mysqlbinlog.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_row_record_find_myisam.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_row_sp001.result mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result mysql-test/suite/rpl/r/rpl_row_sp003.result mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result mysql-test/suite/rpl/r/rpl_row_sp008.result mysql-test/suite/rpl/r/rpl_row_sp009.result mysql-test/suite/rpl/r/rpl_row_sp010.result mysql-test/suite/rpl/r/rpl_row_sp011.result mysql-test/suite/rpl/r/rpl_row_sp012.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_row_tbl_metadata.result mysql-test/suite/rpl/r/rpl_row_trig001.result mysql-test/suite/rpl/r/rpl_row_trig002.result mysql-test/suite/rpl/r/rpl_row_trig003.result mysql-test/suite/rpl/r/rpl_row_trig004.result mysql-test/suite/rpl/r/rpl_row_trunc_temp.result mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result mysql-test/suite/rpl/r/rpl_row_utf16.result mysql-test/suite/rpl/r/rpl_row_utf32.result mysql-test/suite/rpl/r/rpl_row_view01.result mysql-test/suite/rpl/r/rpl_row_wide_table.result mysql-test/suite/rpl/r/rpl_savepoint.result mysql-test/suite/rpl/r/rpl_seconds_behind_master.result mysql-test/suite/rpl/r/rpl_semi_sync.result mysql-test/suite/rpl/r/rpl_semi_sync_event.result mysql-test/suite/rpl/r/rpl_sequential.result mysql-test/suite/rpl/r/rpl_server_id1.result mysql-test/suite/rpl/r/rpl_server_id2.result mysql-test/suite/rpl/r/rpl_server_id_ignore.result mysql-test/suite/rpl/r/rpl_server_uuid.result mysql-test/suite/rpl/r/rpl_session_var.result mysql-test/suite/rpl/r/rpl_set_charset.result mysql-test/suite/rpl/r/rpl_set_null_innodb.result mysql-test/suite/rpl/r/rpl_set_null_myisam.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_show_master_info_file.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/r/rpl_show_slave_running.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_skip_incident.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_in.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_slave_start.result mysql-test/suite/rpl/r/rpl_slave_status.result mysql-test/suite/rpl/r/rpl_slow_query_log.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_sp004.result mysql-test/suite/rpl/r/rpl_sp_effects.result mysql-test/suite/rpl/r/rpl_spec_variables.result mysql-test/suite/rpl/r/rpl_sporadic_master.result mysql-test/suite/rpl/r/rpl_ssl.result mysql-test/suite/rpl/r/rpl_ssl1.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_auto_increment_bug33029.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_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result mysql-test/suite/rpl/r/rpl_stm_found_rows.result mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_loadfile.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.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_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_multi_query.result mysql-test/suite/rpl/r/rpl_stm_no_op.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_stm_sql_mode.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/r/rpl_stm_user_variables.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result mysql-test/suite/rpl/r/rpl_sync.result mysql-test/suite/rpl/r/rpl_temp_table.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/r/rpl_test_framework.result mysql-test/suite/rpl/r/rpl_timezone.result mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result mysql-test/suite/rpl/r/rpl_trigger.result mysql-test/suite/rpl/r/rpl_trunc_temp.result mysql-test/suite/rpl/r/rpl_truncate_2myisam.result mysql-test/suite/rpl/r/rpl_truncate_3innodb.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/r/rpl_typeconv_innodb.result mysql-test/suite/rpl/r/rpl_udf.result mysql-test/suite/rpl/r/rpl_user.result mysql-test/suite/rpl/r/rpl_user_variables.result mysql-test/suite/rpl/r/rpl_variables.result mysql-test/suite/rpl/r/rpl_variables_stm.result mysql-test/suite/rpl/r/rpl_view.result mysql-test/suite/rpl/r/rpl_view_multi.result mysql-test/suite/sys_vars/r/relay_log_basename_basic.result mysql-test/suite/sys_vars/r/relay_log_index_basic.result mysql-test/suite/sys_vars/r/rpl_init_slave_func.result mysql-test/t/rewrite_general_log.test sql/lex.h sql/rpl_handler.cc sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_lex.h sql/sql_yacc.yy === modified file 'mysql-test/r/gis.result' --- a/mysql-test/r/gis.result 2011-08-03 11:29:20 +0000 +++ b/mysql-test/r/gis.result 2011-11-11 10:08:13 +0000 @@ -1450,3 +1450,9 @@ WHERE ST_Contains(ST_Buffer(bridges.posi count(*) 1 DROP DATABASE gis_ogs; +# +# Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE +# +SELECT ST_Union('', ''), md5(1); +ST_Union('', '') md5(1) +NULL c4ca4238a0b923820dcc509a6f75849b === modified file 'mysql-test/t/gis.test' --- a/mysql-test/t/gis.test 2011-07-04 12:22:37 +0000 +++ b/mysql-test/t/gis.test 2011-11-11 10:08:13 +0000 @@ -1367,3 +1367,9 @@ WHERE ST_Contains(ST_Buffer(bridges.posi #WHERE lakes.name = 'Blue Lake'; DROP DATABASE gis_ogs; + +--echo # +--echo # Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE +--echo # + +SELECT ST_Union('', ''), md5(1); === modified file 'sql/item_geofunc.cc' --- a/sql/item_geofunc.cc 2011-07-28 10:54:44 +0000 +++ b/sql/item_geofunc.cc 2011-11-11 10:08:13 +0000 @@ -1038,7 +1038,7 @@ exit: func.reset(); scan_it.reset(); res_receiver.reset(); - DBUG_RETURN(str_value); + DBUG_RETURN(null_value ? 0 : str_value); } No bundle (reason: useless for push emails).