List:Commits« Previous MessageNext Message »
From:Luis Soares Date:November 11 2011 10:10am
Subject:bzr push into mysql-trunk branch (luis.soares:3597 to 3598) WL#4143
View as plain text  
 3598 Luis Soares	2011-11-11 [merge]
      WL#4143
      
      Automerged mysql-trunk-wl4143 into latest mysql-trunk.

    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
 3597 Sneha Modi	2011-11-11 [merge]
      BUG#11748731 - 37248: SOME 'BIG' TESTS FAILING ON 6.0 :
      
      Merging from mysql-5.5 -> mysql-trunk

    modified:
      sql/sql_table.cc
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2011-08-19 13:04:28 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2011-10-02 08:25:38 +0000
@@ -227,6 +227,12 @@ INSERT INTO global_suppressions VALUES
  (".*If a crash happens this configuration does not guarantee.*"),
 
  /*
+   Warning messages introduced in the context of the WL#4143.
+ */
+ ("Storing MySQL user name or password information in the master.info repository is not secure.*"),
+ ("Sending passwords in plain text without SSL/TLS is extremely insecure."),
+
+ /*
   In MTS if the user issues a stop slave sql while it is scheduling a group
   of events, this warning is emitted.
   */

=== modified file 'mysql-test/r/auth_rpl.result'
--- a/mysql-test/r/auth_rpl.result	2011-09-16 12:46:15 +0000
+++ b/mysql-test/r/auth_rpl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 [connection slave]
 include/stop_slave.inc
@@ -11,6 +14,9 @@ CHANGE MASTER TO
 MASTER_USER=     'plug_user',
 MASTER_PASSWORD= 'plug_user',
 MASTER_RETRY_COUNT= 0;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 # Slave in-sync with master now.
 SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
@@ -19,6 +25,9 @@ plug_user	test_plugin_server	plug_user
 # Cleanup (on slave).
 include/stop_slave.inc
 CHANGE MASTER TO MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 DROP USER 'plug_user';
 # Cleanup (on master).
 DROP USER 'plug_user';

=== modified file 'mysql-test/r/rpl_mysqldump_slave.result'
--- a/mysql-test/r/rpl_mysqldump_slave.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/r/rpl_mysqldump_slave.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #
 # New --dump-slave, --apply-slave-statements functionality

=== modified file 'mysql-test/suite/binlog/r/binlog_rewrite.result'
--- a/mysql-test/suite/binlog/r/binlog_rewrite.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/binlog/r/binlog_rewrite.result	2011-11-07 16:17:30 +0000
@@ -27,6 +27,9 @@ DROP PROCEDURE p1;
 GRANT ALL on *.* TO test_user1 IDENTIFIED BY 'azundris1';
 CREATE USER test_user2 IDENTIFIED BY 'azundris2';
 CHANGE MASTER TO MASTER_PASSWORD='azundris3';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CREATE USER 'test_user4'@'localhost';
 SET PASSWORD FOR 'test_user4'@'localhost' = PASSWORD('azundris4');
 show binlog events from <binlog_start>;

=== modified file 'mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result'
--- a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2011-03-17 10:31:42 +0000
+++ b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2011-11-09 09:33:14 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @save_general_log = @@global.general_log;
 set @save_log_output = @@global.log_output;
@@ -8,6 +11,9 @@ set @@global.log_output = 'table,file';
 include/stop_slave.inc
 change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
 master_user = 'root', master_heartbeat_period = 0;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
 include/start_slave.inc
 include/stop_slave.inc

=== modified file 'mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result'
--- a/mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result	2011-02-17 15:36:05 +0000
+++ b/mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result	2011-11-09 09:33:14 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result'
--- a/mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result	2011-02-17 15:36:05 +0000
+++ b/mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result	2011-11-09 09:33:14 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/parts/r/rpl_partition.result'
--- a/mysql-test/suite/parts/r/rpl_partition.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/parts/r/rpl_partition.result	2011-11-09 09:33:14 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/perfschema/r/relaylog.result'
--- a/mysql-test/suite/perfschema/r/relaylog.result	2011-09-02 20:03:36 +0000
+++ b/mysql-test/suite/perfschema/r/relaylog.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists test.t1;
 reset master;

=== modified file 'mysql-test/suite/rpl/r/rpl_000010.result'
--- a/mysql-test/suite/rpl/r/rpl_000010.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000010.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (n int not null auto_increment primary key);
 insert into t1 values(NULL);

=== modified file 'mysql-test/suite/rpl/r/rpl_000011.result'
--- a/mysql-test/suite/rpl/r/rpl_000011.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000011.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (n int);
 insert into t1 values(1);

=== modified file 'mysql-test/suite/rpl/r/rpl_000013.result'
--- a/mysql-test/suite/rpl/r/rpl_000013.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000013.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t2(n int);
 create temporary table t1 (n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_000017.result'
--- a/mysql-test/suite/rpl/r/rpl_000017.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000017.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
 grant replication slave on *.* to replicate@stripped identified by 'aaaaaaaaaaaaaaab';

=== modified file 'mysql-test/suite/rpl/r/rpl_DML_error.result'
--- a/mysql-test/suite/rpl/r/rpl_DML_error.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_DML_error.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 # Verify the statements can be binlogged correctly when error happens
 # ------------------------------------------------------------------

=== modified file 'mysql-test/suite/rpl/r/rpl_EE_err.result'
--- a/mysql-test/suite/rpl/r/rpl_EE_err.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_EE_err.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int) engine=myisam;
 flush tables;

=== modified file 'mysql-test/suite/rpl/r/rpl_LD_INFILE.result'
--- a/mysql-test/suite/rpl/r/rpl_LD_INFILE.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_LD_INFILE.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));

=== modified file 'mysql-test/suite/rpl/r/rpl_alter.result'
--- a/mysql-test/suite/rpl/r/rpl_alter.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_alter.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database mysqltest;
 create table mysqltest.t1 ( n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_alter_db.result'
--- a/mysql-test/suite/rpl/r/rpl_alter_db.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_alter_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Verify that alter database does not stop replication ====
 create database temp_db;

=== modified file 'mysql-test/suite/rpl/r/rpl_alter_repository.result'
--- a/mysql-test/suite/rpl/r/rpl_alter_repository.result	2011-10-20 09:01:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_alter_repository.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -65,6 +68,9 @@ ERROR HY000: Column count of mysql.slave
 ALTER TABLE mysql.slave_relay_log_info ADD COLUMN (Sql_delay INTEGER NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.');
 RESET SLAVE ALL;
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT, MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_LOG_POS;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 ALTER TABLE mysql.slave_master_info DROP COLUMN Retry_count;
 INSERT INTO t_innodb VALUES (1), (2), (3);
@@ -89,6 +95,9 @@ ERROR HY000: Column count of mysql.slave
 ALTER TABLE mysql.slave_master_info ADD COLUMN (Retry_count BIGINT UNSIGNED NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.');
 RESET SLAVE ALL;
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT, MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_LOG_POS;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 ANALYZE TABLE mysql.slave_master_info, mysql.slave_relay_log_info;
 Table	Op	Msg_type	Msg_text

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment.result	2011-05-02 13:52:51 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3;
 insert into t1 values (NULL,1),(NULL,2),(NULL,3);

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment_11932.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists test1;
 create database test1;

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 SET @old_relay_log_purge= @@global.relay_log_purge;

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 # Test case1: INVOKES A TRIGGER with after insert action
 create table t1(a int, b int) engine=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result'
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-05-13 13:35:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_corruption.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_corruption.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Found invalid event in binary log');
 call mtr.add_suppression('Slave SQL.*Relay log read failure: Could not parse relay log event entry.* 1594');

=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result	2010-12-22 09:17:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #######################################################################
 ####################### PART 1: MASTER TESTS ##########################

=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database d1;
 use d1;

=== modified file 'mysql-test/suite/rpl/r/rpl_bit.result'
--- a/mysql-test/suite/rpl/r/rpl_bit.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bit.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (

=== modified file 'mysql-test/suite/rpl/r/rpl_bit_npk.result'
--- a/mysql-test/suite/rpl/r/rpl_bit_npk.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bit_npk.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (

=== modified file 'mysql-test/suite/rpl/r/rpl_blackhole.result'
--- a/mysql-test/suite/rpl/r/rpl_blackhole.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_blackhole.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 CREATE TABLE t1 (a INT, b INT, c INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_bug26395.result'
--- a/mysql-test/suite/rpl/r/rpl_bug26395.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug26395.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_bug31076.result'
--- a/mysql-test/suite/rpl/r/rpl_bug31076.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug31076.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @saved_slave_type_conversions = @@slave_type_conversions;
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY';

=== modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result	2011-11-07 16:17:30 +0000
@@ -1,10 +1,16 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Failed during slave I/O thread initialization");
 call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593");
 include/stop_slave.inc
 reset slave;
 SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Failed during slave thread initialization'

=== modified file 'mysql-test/suite/rpl/r/rpl_bug37426.result'
--- a/mysql-test/suite/rpl/r/rpl_bug37426.result	2011-04-13 20:18:08 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug37426.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE char128_utf8 (i1 INT NOT NULL, c CHAR(128) CHARACTER SET utf8 NOT NULL, i2 INT NOT NULL);
 INSERT INTO char128_utf8 VALUES ( 1, "123", 1 );

=== modified file 'mysql-test/suite/rpl/r/rpl_bug38694.result'
--- a/mysql-test/suite/rpl/r/rpl_bug38694.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug38694.result	2011-11-07 16:17:30 +0000
@@ -1,3 +1,6 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_bug41902.result'
--- a/mysql-test/suite/rpl/r/rpl_bug41902.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug41902.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 stop slave;
 SET @@debug="d,simulate_find_log_pos_error";

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2011-01-17 18:29:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
 create table t1(n int);
@@ -10,6 +13,9 @@ insert into t1 values(2);
 include/wait_for_slave_param.inc [Read_Master_Log_Pos]
 include/stop_slave.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 select * from t1;
 n

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2011-01-17 18:29:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
 create table t1(n int);
@@ -10,6 +13,9 @@ insert into t1 values(2);
 include/wait_for_slave_param.inc [Read_Master_Log_Pos]
 include/stop_slave.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 select * from t1;
 n

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master_dbug.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master_dbug.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_dbug.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 CHANGE MASTER TO master_retry_count=3, master_host='dummy', master_connect_retry=1;

=== modified file 'mysql-test/suite/rpl/r/rpl_charset.result'
--- a/mysql-test/suite/rpl/r/rpl_charset.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_charset.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set timestamp=1000000000;
 create database mysqltest2 character set latin2;

=== modified file 'mysql-test/suite/rpl/r/rpl_charset_sjis.result'
--- a/mysql-test/suite/rpl/r/rpl_charset_sjis.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_charset_sjis.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1;
 drop procedure if exists p1;

=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log');
 call mtr.add_suppression('Replication event checksum verification failed');
@@ -110,6 +113,9 @@ must be zero
 0
 include/stop_slave.inc
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 flush logs;
 reset master;
 insert into t3 value (1, @@global.binlog_checksum);

=== modified file 'mysql-test/suite/rpl/r/rpl_checksum_cache.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum_cache.result	2011-03-18 13:11:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum_cache.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t2 set data=repeat.*'a', @act_size.*");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t1 values.* NAME_CONST.*'n',.*, @data .*");

=== modified file 'mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2011-11-07 16:17:30 +0000
@@ -1,5 +1,17 @@
 *** Set up circular replication on four servers *** 
 include/rpl_init.inc [topology=1->2->3->4->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 
 *** Preparing data ***
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM;
@@ -77,6 +89,9 @@ Master D	8	D
 include/stop_slave_io.inc
 include/stop_slave.inc
 include/rpl_change_topology.inc [new topology=1->2->4->1,2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 
 * Check data inserted before failure *
@@ -131,6 +146,9 @@ include/start_slave.inc
 RESET MASTER;
 RESET SLAVE;
 include/rpl_change_topology.inc [new topology=1->2->3->4->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/rpl_sync.inc
 

=== modified file 'mysql-test/suite/rpl/r/rpl_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_colSize.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_colSize.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1;
 **** Testing WL#3228 changes. ****

=== modified file 'mysql-test/suite/rpl/r/rpl_commit_after_flush.result'
--- a/mysql-test/suite/rpl/r/rpl_commit_after_flush.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_commit_after_flush.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT) ENGINE=innodb;
 begin;

=== modified file 'mysql-test/suite/rpl/r/rpl_concurrency_error.result'
--- a/mysql-test/suite/rpl/r/rpl_concurrency_error.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_concurrency_error.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 ########################################################################

=== modified file 'mysql-test/suite/rpl/r/rpl_conditional_comments.result'
--- a/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2011-01-15 05:56:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1(c1 INT);
 show binlog events from <binlog_start>;

=== modified file 'mysql-test/suite/rpl/r/rpl_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_corruption.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_corruption.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Found invalid event in binary log');
 call mtr.add_suppression('Slave I/O: Relay log write failure: could not queue event from master');

=== modified file 'mysql-test/suite/rpl/r/rpl_crash_safe_master.result'
--- a/mysql-test/suite/rpl/r/rpl_crash_safe_master.result	2011-05-12 21:51:20 +0000
+++ b/mysql-test/suite/rpl/r/rpl_crash_safe_master.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 RESET MASTER;

=== modified file 'mysql-test/suite/rpl/r/rpl_create_database.result'
--- a/mysql-test/suite/rpl/r/rpl_create_database.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_create_database.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP DATABASE IF EXISTS mysqltest_prometheus;
 DROP DATABASE IF EXISTS mysqltest_sisyfos;

=== modified file 'mysql-test/suite/rpl/r/rpl_create_if_not_exists.result'
--- a/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result	2011-01-17 16:27:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP DATABASE IF EXISTS mysqltest;
 CREATE DATABASE IF NOT EXISTS mysqltest;

=== modified file 'mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result'
--- a/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP DATABASE IF EXISTS mysqltest;
 CREATE TEMPORARY TABLE IF NOT EXISTS tmp(c1 int);

=== modified file 'mysql-test/suite/rpl/r/rpl_cross_version.result'
--- a/mysql-test/suite/rpl/r/rpl_cross_version.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_cross_version.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_current_user.result'
--- a/mysql-test/suite/rpl/r/rpl_current_user.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_current_user.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_connect.inc [creating master]
 include/rpl_connect.inc [creating slave]
 CREATE TABLE t1(c1 char(100));

=== modified file 'mysql-test/suite/rpl/r/rpl_deadlock_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2011-03-27 18:16:32 +0000
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 *** Prepare tables and data ***
 CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_delete_no_where.result'
--- a/mysql-test/suite/rpl/r/rpl_delete_no_where.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_delete_no_where.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int, b int) engine=myisam;
 insert into t1 values(1,1);

=== modified file 'mysql-test/suite/rpl/r/rpl_do_db_filter.result'
--- a/mysql-test/suite/rpl/r/rpl_do_db_filter.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_db_filter.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_do_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_do_grant.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_grant.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 delete from mysql.user where user=_binary'rpl_do_grant';
 delete from mysql.db where user=_binary'rpl_do_grant';

=== modified file 'mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result'
--- a/mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result'
--- a/mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_drop.result'
--- a/mysql-test/suite/rpl/r/rpl_drop.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int);
 drop table t1, t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_db.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_db.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_temp.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_temp.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_temp.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database if not exists mysqltest;
 use mysqltest;

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_view.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_view.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_view.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1, t2;
 drop view if exists v1, v2, v3, not_exist_view;

=== modified file 'mysql-test/suite/rpl/r/rpl_dual_pos_advance.result'
--- a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 create table t1 (n int);
 include/stop_slave.inc
 create table t2 (n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_empty_master_host.result'
--- a/mysql-test/suite/rpl/r/rpl_empty_master_host.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_empty_master_host.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 STOP SLAVE;
 include/wait_for_slave_to_stop.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_err_ignoredtable.result'
--- a/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int primary key);
 create table t4 (a int primary key);

=== modified file 'mysql-test/suite/rpl/r/rpl_events.result'
--- a/mysql-test/suite/rpl/r/rpl_events.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_events.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @old_event_scheduler = @@global.event_scheduler;
 set global event_scheduler=1;

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result	2011-03-31 08:39:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 ***********************************************************

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result	2011-03-31 08:39:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 ***********************************************************

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");

=== modified file 'mysql-test/suite/rpl/r/rpl_failed_optimize.result'
--- a/mysql-test/suite/rpl/r/rpl_failed_optimize.result	2011-02-15 12:12:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_failed_optimize.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 ( a int ) ENGINE=InnoDB;
 BEGIN;

=== modified file 'mysql-test/suite/rpl/r/rpl_filter_database.result'
--- a/mysql-test/suite/rpl/r/rpl_filter_database.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_filter_database.result	2011-11-07 16:17:30 +0000
@@ -1,3 +1,6 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (id int, a int);
 CREATE TABLE t2 (id int, b int);

=== modified file 'mysql-test/suite/rpl/r/rpl_flush_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_flush_logs.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_flush_logs.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 # Test if support 'flush error logs' statement.
 flush error logs;

=== modified file 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result'
--- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show variables like 'relay_log%';
 Variable_name	Value
 relay_log	

=== modified file 'mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT AUTO_INCREMENT KEY) ENGINE=INNODB;
 CREATE TABLE t2 (b INT AUTO_INCREMENT KEY, c INT, FOREIGN KEY(b) REFERENCES t1(a)) ENGINE=INNODB;

=== modified file 'mysql-test/suite/rpl/r/rpl_free_items.result'
--- a/mysql-test/suite/rpl/r/rpl_free_items.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_free_items.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int);
 create table t2 (a int);

=== modified file 'mysql-test/suite/rpl/r/rpl_general_log.result'
--- a/mysql-test/suite/rpl/r/rpl_general_log.result	2011-09-22 10:14:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_general_log.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 SET @old_log_output= @@log_output;

=== modified file 'mysql-test/suite/rpl/r/rpl_geometry.result'
--- a/mysql-test/suite/rpl/r/rpl_geometry.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_geometry.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a varchar(100),
 b multipoint not null,

=== modified file 'mysql-test/suite/rpl/r/rpl_get_lock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_lock.result	2011-07-19 15:11:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_lock.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 create table t1(n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
 call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'");

=== modified file 'mysql-test/suite/rpl/r/rpl_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_grant.result	2011-03-11 19:16:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_grant.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Master ****
 CREATE USER dummy@localhost;

=== modified file 'mysql-test/suite/rpl/r/rpl_grant_plugin.result'
--- a/mysql-test/suite/rpl/r/rpl_grant_plugin.result	2011-02-11 10:27:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_grant_plugin.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/assert.inc [Logged query must match the one issued.]
 include/assert.inc [Logged query must match the one issued.]

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2011-08-16 16:30:11 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2011-11-07 16:17:30 +0000
@@ -6,6 +6,9 @@ SHOW STATUS LIKE "Slave_last_heartbeat";
 Variable_name	Slave_last_heartbeat
 Value	
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.000
@@ -17,16 +20,23 @@ Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
 Warnings:
 Warning	1716	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
 Warnings:
 Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4294967.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.001;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.001
@@ -35,12 +45,17 @@ set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
 Warnings:
 Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.001
 reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4.000
@@ -51,6 +66,9 @@ reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.5;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.500

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result	2011-02-04 19:07:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2,1->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_connect.inc [creating master]
 include/rpl_connect.inc [creating slave_1]
 include/rpl_connect.inc [creating slave_2]
@@ -13,6 +19,9 @@ include/assert.inc [slave_1 should have
 
 include/rpl_stop_slaves.inc
 include/rpl_change_topology.inc [new topology=1->3->2]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_start_slaves.inc
 include/stop_slave.inc
 CHANGE MASTER TO MASTER_HEARTBEAT_PERIOD=0.1;

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat_basic.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
@@ -13,12 +16,18 @@ SET @restore_event_scheduler=@@global.ev
 
 *** Default value ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 slave_net_timeout/slave_heartbeat_timeout=2.0000
 RESET SLAVE;
 
 *** Reset slave affect ***
 SET @@global.slave_net_timeout=30;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 RESET SLAVE;
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
@@ -27,6 +36,9 @@ Slave_heartbeat_period	15.000
 *** Default value if slave_net_timeout changed ***
 SET @@global.slave_net_timeout=50;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	25.000
@@ -44,11 +56,16 @@ RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=SLAVE_NET_TIMEOUT;
 Warnings:
 Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 RESET SLAVE;
 
 *** CHANGE MASTER statement only updates slave_heartbeat_period ***
 SET @@global.slave_net_timeout=20;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW VARIABLES LIKE 'slave_net_timeout';
 Variable_name	Value
 slave_net_timeout	20
@@ -70,6 +87,9 @@ SET @@global.slave_net_timeout=500;
 SET @@global.slave_net_timeout=200;
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 SHOW VARIABLES LIKE 'slave_net_timeout';
 Variable_name	Value
@@ -85,6 +105,9 @@ SET @@global.slave_net_timeout=@restore_
 *** Start/stop slave ***
 SET @@global.slave_net_timeout=100;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=20;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
@@ -97,6 +120,9 @@ Slave_heartbeat_period	20.000
 *** Reload slave ***
 SET @@global.slave_net_timeout=50;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=30;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_restart_server.inc [server_number=2]
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
@@ -105,6 +131,9 @@ SET @restore_slave_net_timeout=@@global.
 
 *** Disable heartbeat ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	0.000
@@ -132,6 +161,9 @@ Result
 
 *** Min slave_heartbeat_timeout ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.001;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	0.001
@@ -139,6 +171,8 @@ RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.0009;
 Warnings:
 Warning	1716	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	0.000
@@ -148,6 +182,8 @@ RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294967;
 Warnings:
 Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	4294967.000
@@ -175,6 +211,9 @@ RESET SLAVE;
 
 *** Running slave ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Heartbeat event received
 
@@ -223,6 +262,9 @@ UPDATE test.t1 SET a = a + 1 WHERE a < 1
 END|
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 SET @@global.event_scheduler=1;
 Number of received heartbeat events: 0
@@ -236,6 +278,9 @@ DROP TABLE t1;
 DROP TABLE t1;
 RESET MASTER;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.5;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Heartbeat events are received while rotation of relay logs (1 means 'yes'): 1
 
@@ -245,6 +290,9 @@ include/stop_slave.inc
 RESET SLAVE;
 SET @@global.slave_compressed_protocol=1;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Heartbeat event received
 SET @@global.slave_compressed_protocol=0;
@@ -254,6 +302,9 @@ SET @@global.slave_compressed_protocol=0
 STOP SLAVE;
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 RESET MASTER;
 Heartbeat events are received after reset of master (1 means 'yes'): 1
@@ -262,6 +313,9 @@ Heartbeat events are received after rese
 STOP SLAVE;
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Heartbeat event received
 include/rpl_restart_server.inc [server_number=1]
@@ -272,6 +326,9 @@ Heartbeat event received
 include/rpl_reset.inc
 include/stop_slave.inc
 include/rpl_change_topology.inc [new topology=1->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10));
 INSERT INTO t1 VALUES(1, 'on master');

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 *** Heartbeat over SSL ***
@@ -14,6 +17,9 @@ MASTER_SSL=1,
 MASTER_SSL_CA='MYSQL_TEST_DIR/std_data/cacert.pem',
 MASTER_SSL_CERT='MYSQL_TEST_DIR/std_data/client-cert.pem',
 MASTER_SSL_KEY='MYSQL_TEST_DIR/std_data/client-key.pem';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Master_SSL_Allowed: Yes
 Heartbeat event has received

=== modified file 'mysql-test/suite/rpl/r/rpl_idempotency.result'
--- a/mysql-test/suite/rpl/r/rpl_idempotency.result	2011-02-23 11:54:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_idempotency.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave SQL.*Can.t find record in .t[12].* Error_code: 1032");
 call mtr.add_suppression("Slave SQL.*Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_db_filter.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_db_filter.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_db_filter.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_grant.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_grant.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 delete from mysql.user where user=_binary'rpl_ignore_grant';
 delete from mysql.db where user=_binary'rpl_ignore_grant';

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_revoke.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_revoke.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_revoke.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 grant select on *.* to 'user_foo'@'%' identified by 'user_foopass';
 revoke select on *.* from 'user_foo'@'%';

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_table.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_table.result	2011-03-18 14:58:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** Test case for BUG#16487 ****
 **** Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE mydb;
 USE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_table_update.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_table_update.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_table_update.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 drop table if exists mysqltest_foo;

=== modified file 'mysql-test/suite/rpl/r/rpl_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_incident.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_incident.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_init_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_init_slave.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_init_slave.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set global max_connections=151;
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_init_slave_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result	2011-03-21 16:04:11 +0000
+++ b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 stop slave;
 reset slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_bug28430.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_bug30888.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==========MASTER==========
 show global variables like 'binlog_format%';

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==========MASTER==========
 show global variables like 'binlog_format%';

=== modified file 'mysql-test/suite/rpl/r/rpl_insert.result'
--- a/mysql-test/suite/rpl/r/rpl_insert.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_insert.result	2011-11-07 16:17:30 +0000
@@ -2,6 +2,9 @@
 # Bug#20821: INSERT DELAYED fails to write some rows to binlog
 #
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE SCHEMA IF NOT EXISTS mysqlslap;
 USE mysqlslap;

=== modified file 'mysql-test/suite/rpl/r/rpl_insert_id.result'
--- a/mysql-test/suite/rpl/r/rpl_insert_id.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_insert_id.result	2011-11-07 16:17:30 +0000
@@ -8,6 +8,9 @@
 # We also check how the foreign_key_check variable is replicated
 #
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @old_concurrent_insert= @@global.concurrent_insert;
 SET @@global.concurrent_insert= 0;

=== modified file 'mysql-test/suite/rpl/r/rpl_insert_id_pk.result'
--- a/mysql-test/suite/rpl/r/rpl_insert_id_pk.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_insert_id_pk.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a int auto_increment, primary key(a));
 create table t2(b int auto_increment, c int, primary key(b));

=== modified file 'mysql-test/suite/rpl/r/rpl_insert_ignore.result'
--- a/mysql-test/suite/rpl/r/rpl_insert_ignore.result	2011-09-29 09:17:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_insert_ignore.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 CREATE TABLE t1 (

=== modified file 'mysql-test/suite/rpl/r/rpl_invoked_features.result'
--- a/mysql-test/suite/rpl/r/rpl_invoked_features.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_invoked_features.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 USE test;
 DROP VIEW IF EXISTS v1,v11;

=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix.result	2011-11-07 16:17:30 +0000
@@ -64,3 +64,6 @@ Master-Host: 127.0.0.1
 change master to master_host='0:0:0:0:0:0:0:1';
 Master-Host: 0:0:0:0:0:0:0:1
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.

=== modified file 'mysql-test/suite/rpl/r/rpl_ip_mix2.result'
--- a/mysql-test/suite/rpl/r/rpl_ip_mix2.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ip_mix2.result	2011-11-07 16:17:30 +0000
@@ -64,3 +64,6 @@ Master-Host: 127.0.0.1
 change master to master_host='0:0:0:0:0:0:0:1';
 Master-Host: 0:0:0:0:0:0:0:1
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.

=== modified file 'mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result'
--- a/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result	2011-11-07 16:17:30 +0000
@@ -106,3 +106,6 @@ Master-Host: 127.0.0.1
 change master to master_host='0:0000:0000:0:0000:FFFF:127.0.0.1';
 Master-Host: 0:0000:0000:0:0000:FFFF:127.0.0.1
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.

=== modified file 'mysql-test/suite/rpl/r/rpl_ipv6.result'
--- a/mysql-test/suite/rpl/r/rpl_ipv6.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ipv6.result	2011-11-07 16:17:30 +0000
@@ -61,3 +61,6 @@ Master-Host: 127.0.0.1
 change master to master_host='0:0:0:0:0:0:0:1';
 Master-Host: 0:0:0:0:0:0:0:1
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.

=== modified file 'mysql-test/suite/rpl/r/rpl_killed_ddl.result'
--- a/mysql-test/suite/rpl/r/rpl_killed_ddl.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_killed_ddl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP DATABASE IF EXISTS d1;
 DROP DATABASE IF EXISTS d2;

=== modified file 'mysql-test/suite/rpl/r/rpl_known_bugs_detection.result'
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2011-09-29 10:42:53 +0000
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,
 UNIQUE(b));

=== modified file 'mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result'
--- a/mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET SQL_LOG_BIN=0;
 CREATE DATABASE B37656;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result	2011-10-18 00:49:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select last_insert_id();
 last_insert_id()
@@ -39,7 +42,13 @@ load data infile '../../std_data/rpl_loa
 include/wait_for_slave_sql_error.inc [errno=1062]
 include/stop_slave_io.inc
 change master to master_user='test';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/check_slave_no_error.inc
 set global sql_slave_skip_counter=1;
 start slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_charset.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_charset.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_charset.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a varchar(10) character set utf8);
 load data infile '../../std_data/loaddata6.dat' into table t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_fatal.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,10);

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_m.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest;
 USE test;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_map.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_map.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_map.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Create a big file ====
 ==== Load our big file into a table ====

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_s.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_s.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_s.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 reset master;
 create table test.t1(a int, b int, unique(b));

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_simple.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_simple.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_simple.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_symlink.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_symlink.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_symlink.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a int not null auto_increment, b int, primary key(a) );
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddatalocal.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddatalocal.result	2011-05-12 05:23:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a int);
 select * into outfile 'MYSQLD_DATADIR/rpl_loaddatalocal.select_outfile' from t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_loadfile.result'
--- a/mysql-test/suite/rpl/r/rpl_loadfile.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loadfile.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_locale.result'
--- a/mysql-test/suite/rpl/r/rpl_locale.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locale.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (s1 char(10));
 set lc_time_names= 'de_DE';

=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression ("Slave I/O: Got fatal error 1236 from master when reading data from binary");
 show master status;

=== modified file 'mysql-test/suite/rpl/r/rpl_manual_change_index_file.result'
--- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 FLUSH LOGS;
 CREATE TABLE t1(c1 INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_many_optimize.result'
--- a/mysql-test/suite/rpl/r/rpl_many_optimize.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_many_optimize.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int not null auto_increment primary key, b int, key(b));
 INSERT INTO t1 (a) VALUES (1),(2);

=== added file 'mysql-test/suite/rpl/r/rpl_master_connection.result'
--- a/mysql-test/suite/rpl/r/rpl_master_connection.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_master_connection.result	2011-11-07 16:17:30 +0000
@@ -0,0 +1,230 @@
+include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+[connection master]
+SET SQL_LOG_BIN=0;
+SELECT user, plugin, authentication_string, password FROM mysql.user WHERE user != 'root';
+user	plugin	authentication_string	password
+CREATE USER 'plug_user_p' IDENTIFIED WITH 'test_plugin_server' AS 'proxy_user_p';
+CREATE USER 'plug_user_wp' IDENTIFIED WITH 'test_plugin_server' AS 'proxy_user_wp';
+CREATE USER 'proxy_user_p' IDENTIFIED BY 'password';
+CREATE USER 'proxy_user_wp' IDENTIFIED BY '';
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+SELECT user, plugin, authentication_string, password FROM mysql.user WHERE user != 'root';
+user	plugin	authentication_string	password
+plug_user_p	test_plugin_server	proxy_user_p	
+plug_user_wp	test_plugin_server	proxy_user_wp	
+proxy_user_p		NULL	*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19
+proxy_user_wp		NULL	
+regular_user_p		NULL	*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19
+regular_user_wp		NULL	
+GRANT PROXY ON proxy_user_p to plug_user_p;
+GRANT PROXY ON proxy_user_wp to plug_user_wp;
+GRANT REPLICATION SLAVE ON *.* TO proxy_user_p;
+GRANT REPLICATION SLAVE ON *.* TO proxy_user_wp;
+GRANT REPLICATION SLAVE ON *.* TO regular_user_p;
+GRANT REPLICATION SLAVE ON *.* TO regular_user_wp;
+SET SQL_LOG_BIN=1;
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password';
+ERROR HY000: Setting authentication options is not possible when only the Slave SQL Thread is being started.
+START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin';
+ERROR HY000: Setting authentication options is not possible when only the Slave SQL Thread is being started.
+START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+ERROR HY000: Setting authentication options is not possible when only the Slave SQL Thread is being started.
+START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_io_to_start.inc
+include/stop_slave_io.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'regular_user_p' PASSWORD= 'password';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'regular_user_wp' PASSWORD= '';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'regular_user_p' PASSWORD= 'password';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'regular_user_wp' PASSWORD= '';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'regular_user_wp';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' DEFAULT_AUTH= 'auth_test_plugin';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' DEFAULT_AUTH= 'auth_test_plugin';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'plug_user_p', MASTER_PASSWORD= 'proxy_user_p';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+include/start_slave.inc
+include/check_slave_is_running.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'plug_user_wp', MASTER_PASSWORD= 'proxy_user_wp';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+include/start_slave.inc
+include/check_slave_is_running.inc
+CREATE USER 'ssl_user' IDENTIFIED BY '';
+GRANT ALL ON *.* TO ssl_user REQUIRE SSL;
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'root', MASTER_PASSWORD = '';
+Warnings:
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+include/start_slave.inc
+include/stop_slave.inc
+START SLAVE USER= 'root' PASSWORD= '';
+include/wait_for_slave_to_start.inc
+include/check_slave_is_running.inc
+SET SQL_LOG_BIN=0;
+DROP USER plug_user_p, plug_user_wp, regular_user_p, regular_user_wp, proxy_user_p, proxy_user_wp;
+SET SQL_LOG_BIN=1;
+DROP USER ssl_user;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_master_pos_wait.result'
--- a/mysql-test/suite/rpl/r/rpl_master_pos_wait.result	2011-07-19 15:11:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_master_pos_wait.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select master_pos_wait('master-bin.999999',0,2);
 master_pos_wait('master-bin.999999',0,2)

=== modified file 'mysql-test/suite/rpl/r/rpl_migration_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_migration_crash_safe.result	2011-03-23 23:28:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_migration_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 CREATE TABLE test(id INTEGER NOT NULL PRIMARY KEY);

=== modified file 'mysql-test/suite/rpl/r/rpl_misc_functions.result'
--- a/mysql-test/suite/rpl/r/rpl_misc_functions.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT');
 create table t1(id int, i int, r1 int, r2 int, p varchar(100));

=== modified file 'mysql-test/suite/rpl/r/rpl_mix_found_rows.result'
--- a/mysql-test/suite/rpl/r/rpl_mix_found_rows.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mix_found_rows.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result'
--- a/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE SCHEMA IF NOT EXISTS mysqlslap;
 USE mysqlslap;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Option binlog_cache_size ");

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
 CREATE TABLE t1 (`bit_key` bit, `bit` bit, key (`bit_key` )) ENGINE=MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (n int auto_increment primary key);
 set insert_id = 2000;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== modified file 'mysql-test/suite/rpl/r/rpl_mts_check_concurrency.result'
--- a/mysql-test/suite/rpl/r/rpl_mts_check_concurrency.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mts_check_concurrency.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE db_1;
 CREATE DATABASE db_2;

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_delete.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_delete.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_delete.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int primary key);
 create table t2 (a int);

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_delete2.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_delete2.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_delete2.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set sql_log_bin=0;
 create database mysqltest_from;

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_engine.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_engine.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_engine.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1;
 CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_update.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_update.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_update.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (
 a int unsigned not null auto_increment primary key,

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_update2.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_update2.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_update2.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1,t2;
 CREATE TABLE t1 (

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_update3.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_update3.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_update3.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 -------- Test for BUG#9361 --------

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_update4.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_update4.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_update4.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists d1;
 drop database if exists d2;

=== modified file 'mysql-test/suite/rpl/r/rpl_mysql_upgrade.result'
--- a/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`;

=== modified file 'mysql-test/suite/rpl/r/rpl_name_const.result'
--- a/mysql-test/suite/rpl/r/rpl_name_const.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_name_const.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result'
--- a/mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT');
 CREATE TABLE t1 (a VARCHAR(1000));

=== modified file 'mysql-test/suite/rpl/r/rpl_not_null_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_not_null_innodb.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_not_null_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET SQL_LOG_BIN= 0;
 CREATE TABLE t1(`a` INT, `b` DATE DEFAULT NULL,

=== modified file 'mysql-test/suite/rpl/r/rpl_not_null_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_not_null_myisam.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_not_null_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET SQL_LOG_BIN= 0;
 CREATE TABLE t1(`a` INT, `b` DATE DEFAULT NULL,

=== modified file 'mysql-test/suite/rpl/r/rpl_optimize.result'
--- a/mysql-test/suite/rpl/r/rpl_optimize.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_optimize.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int not null auto_increment primary key, b int, key(b));
 INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result	2011-11-08 15:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2011-11-11 10:06:39 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
 call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log:");

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Slave: Error dropping database');
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_benchmark.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;
 call mtr.add_suppression('Slave: Error dropping database');

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create view coord_wait_list as
 SELECT id from Information_Schema.processlist

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create view coord_wait_list  as SELECT id from Information_Schema.processlist where state like 'Waiting for Slave Worker%';
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_ddl.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_ddl.result	2011-10-13 12:12:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_ddl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_innodb.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Slave: Error dropping database');
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_multi_db.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_multi_db.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_multi_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Slave SQL: Could not execute Write_rows event on table test.t1');
 call mtr.add_suppression('Slave SQL: Could not execute Update_rows event on table test.t1; Deadlock found when trying to get lock');

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @save_slave_parallel_workers= @@slave_parallel_workers;
 SET @save_default_storage_engine=@@global.default_storage_engine;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_temp_query.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_temp_query.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_temp_query.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table.*');
 flush status;

=== modified file 'mysql-test/suite/rpl/r/rpl_partition_archive.result'
--- a/mysql-test/suite/rpl/r/rpl_partition_archive.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_partition_archive.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id INT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_partition_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_partition_innodb.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_partition_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id INT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_partition_memory.result'
--- a/mysql-test/suite/rpl/r/rpl_partition_memory.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_partition_memory.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id INT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_partition_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_partition_myisam.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_partition_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 use test;
 CREATE TABLE test.regular_tbl(id INT NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/rpl/r/rpl_plugin_load.result'
--- a/mysql-test/suite/rpl/r/rpl_plugin_load.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_plugin_load.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 Verify that example engine is not installed.
 SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';

=== modified file 'mysql-test/suite/rpl/r/rpl_ps.result'
--- a/mysql-test/suite/rpl/r/rpl_ps.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ps.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1;
 create table t1(n char(30));

=== modified file 'mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result'
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT, b LONG);

=== modified file 'mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result'
--- a/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1);

=== modified file 'mysql-test/suite/rpl/r/rpl_read_only.result'
--- a/mysql-test/suite/rpl/r/rpl_read_only.result	2011-02-15 12:12:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_read_only.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 create user test;

=== modified file 'mysql-test/suite/rpl/r/rpl_relay_space_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SHOW VARIABLES LIKE 'relay_log_space_limit';
 Variable_name	Value

=== modified file 'mysql-test/suite/rpl/r/rpl_relay_space_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SHOW VARIABLES LIKE 'relay_log_space_limit';
 Variable_name	Value

=== modified file 'mysql-test/suite/rpl/r/rpl_relayrotate.result'
--- a/mysql-test/suite/rpl/r/rpl_relayrotate.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relayrotate.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 stop slave;
 create table t1 (a int) engine=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_relayspace.result'
--- a/mysql-test/suite/rpl/r/rpl_relayspace.result	2011-05-19 15:47:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relayspace.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 create table t1 (a int);

=== modified file 'mysql-test/suite/rpl/r/rpl_replicate_do.result'
--- a/mysql-test/suite/rpl/r/rpl_replicate_do.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t11;
 drop table if exists t11;

=== modified file 'mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result'
--- a/mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 drop database if exists mysqltest2;

=== modified file 'mysql-test/suite/rpl/r/rpl_report.result'
--- a/mysql-test/suite/rpl/r/rpl_report.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_report.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_host';
 VARIABLE_NAME	VARIABLE_VALUE

=== modified file 'mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result'
--- a/mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE rewrite;
 CREATE DATABASE mydb;

=== modified file 'mysql-test/suite/rpl/r/rpl_rewrt_db.result'
--- a/mysql-test/suite/rpl/r/rpl_rewrt_db.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rewrt_db.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2011-11-07 16:17:30 +0000
@@ -10,6 +10,9 @@ change master to master_host='127.0.0.1'
 ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log
 reset slave;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 reset master;
 start slave;
 include/wait_for_slave_to_start.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result	2011-10-27 14:14:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 show binary logs;
 Log_name	File_size

=== modified file 'mysql-test/suite/rpl/r/rpl_row_001.result'
--- a/mysql-test/suite/rpl/r/rpl_row_001.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_001.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
 LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_4_bytes.result'
--- a/mysql-test/suite/rpl/r/rpl_row_4_bytes.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_4_bytes.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_NOW.result'
--- a/mysql-test/suite/rpl/r/rpl_row_NOW.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_NOW.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database if not exists mysqltest1;
 DROP TABLE IF EXISTS mysqltest1.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_USER.result'
--- a/mysql-test/suite/rpl/r/rpl_row_USER.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_USER.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP DATABASE IF EXISTS mysqltest1;
 CREATE DATABASE mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_UUID.result'
--- a/mysql-test/suite/rpl/r/rpl_row_UUID.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_UUID.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE DATABASE test_ignore;
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM'  ;
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'INNODB'  ;
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_8partition.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1;
 SET @@BINLOG_FORMAT = ROW;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Option binlog_cache_size ");

=== modified file 'mysql-test/suite/rpl/r/rpl_row_blob_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_blob_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1;
 **** Testing WL#3228 changes. ****

=== modified file 'mysql-test/suite/rpl/r/rpl_row_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: .*");
 [on slave]

=== modified file 'mysql-test/suite/rpl/r/rpl_row_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_row_corruption.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_corruption.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1_11753004 (c1 INT);
 CREATE TABLE t2_11753004 (c1 INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");

=== modified file 'mysql-test/suite/rpl/r/rpl_row_delayed_ins.result'
--- a/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a int not null primary key) engine=myisam;
 insert delayed into t1 values (1);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_drop.result'
--- a/mysql-test/suite/rpl/r/rpl_row_drop.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_drop.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a int);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_row_event_max_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2011-10-03 11:49:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a int not null auto_increment, data1 LONGBLOB,
 data2 LONGBLOB, PRIMARY KEY(a));

=== modified file 'mysql-test/suite/rpl/r/rpl_row_find_row.result'
--- a/mysql-test/suite/rpl/r/rpl_row_find_row.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_find_row.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET SQL_LOG_BIN=0;
 CREATE TABLE t (a int, b int, c int, key(b));

=== modified file 'mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int);
 insert into t1 values (10);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_func001.result'
--- a/mysql-test/suite/rpl/r/rpl_row_func001.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_func001.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP FUNCTION test.f1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_func002.result'
--- a/mysql-test/suite/rpl/r/rpl_row_func002.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_func002.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP FUNCTION test.f1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_func003.result'
--- a/mysql-test/suite/rpl/r/rpl_row_func003.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_func003.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
 DROP FUNCTION IF EXISTS test.f1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_idempotency.result'
--- a/mysql-test/suite/rpl/r/rpl_row_idempotency.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_idempotency.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Can.t find record in .t[12].* Error_code: 1032");
 call mtr.add_suppression("Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");

=== modified file 'mysql-test/suite/rpl/r/rpl_row_ignorable_event.result'
--- a/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2011-09-19 09:03:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 # Test non-transaction
 create table t1(a int, b int) engine= myisam;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_blobs.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_blobs.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_blobs.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'NOBLOB';
 SET GLOBAL binlog_row_image= 'NOBLOB';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_eng_full.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_eng_full.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_eng_full.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'FULL';
 SET GLOBAL binlog_row_image= 'FULL';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_eng_min.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_eng_min.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_eng_min.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'MINIMAL';
 SET GLOBAL binlog_row_image= 'MINIMAL';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'NOBLOB';
 SET GLOBAL binlog_row_image= 'NOBLOB';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_idx_full.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_idx_full.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_idx_full.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'FULL';
 SET GLOBAL binlog_row_image= 'FULL';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_idx_min.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_idx_min.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_idx_min.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'MINIMAL';
 SET GLOBAL binlog_row_image= 'MINIMAL';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'NOBLOB';
 SET GLOBAL binlog_row_image= 'NOBLOB';

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_misc.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_misc.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_misc.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t0 ( col1 INT NOT NULL, col2 INT ) ENGINE=InnoDB;
 INSERT INTO t0 (col1,col2) VALUES (4,7),(4,8);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_img_sanity.result'
--- a/mysql-test/suite/rpl/r/rpl_row_img_sanity.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sanity.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave: Can\'t find record in \'t\' Error_code: 1032");
 call mtr.add_suppression("Slave SQL: Could not execute Update_rows event on table test.t; Can.t find record in .t.* Error_code: 1032");

=== modified file 'mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result'
--- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Setup table on master but not on slave ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_row_insert_delayed.result'
--- a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE SCHEMA IF NOT EXISTS mysqlslap;
 USE mysqlslap;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result'
--- a/mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ******** [ MASTER ] ********
 CREATE DATABASE BUG_37656;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 include/wait_for_slave_to_stop.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 include/wait_for_slave_to_stop.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 stop slave;
 #

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== 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-22 15:04:09 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 ---Setup Section  --

=== modified file 'mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result	2011-03-24 10:52:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ## case #1 - last_null_bit_pos==0 in record_compare without X bit
 include/rpl_reset.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result	2011-03-24 10:52:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ## coverage purposes - Field_bits 
 ##                     1 X bit + 2 Null bits + 5 bits => last_null_bit_pos==0

=== modified file 'mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 ( i1 int, c1 char(1), key ( i1 ));
 INSERT IGNORE INTO t1 VALUES (1, 'a');

=== modified file 'mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2011-07-20 10:24:14 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2011-11-07 16:17:30 +0000
@@ -1,15 +1,24 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 Master_User = 'root'
 Master_Host = '127.0.0.1'
 include/stop_slave.inc
 change master to master_user='test';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 Master_User = 'test'
 Master_Host = '127.0.0.1'
 reset slave;
 Master_User = 'test'
 Master_Host = '127.0.0.1'
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Master_User = 'root'
 Master_Host = '127.0.0.1'
@@ -27,20 +36,32 @@ include/stop_slave.inc
 reset slave;
 include/check_slave_no_error.inc
 change master to master_user='impossible_user_name';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_io_error.inc [errno=1045]
 include/stop_slave_sql.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/check_slave_no_error.inc
 stop slave;
 change master to master_user='impossible_user_name';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_io_error.inc [errno=1045]
 include/stop_slave_sql.inc
 reset slave;
 include/check_slave_no_error.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 reset slave;
 include/start_slave.inc
 include/stop_slave.inc
@@ -48,5 +69,8 @@ reset slave all;
 start slave;
 ERROR HY000: The server is not configured as slave; fix in config file or with CHANGE MASTER TO
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2011-01-14 11:15:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 CREATE TABLE t1 (a INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp001.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp001.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp001.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 <Begin test section 1 (non deterministic SP)>

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE test.t1 (a INT AUTO_INCREMENT KEY, t CHAR(6)) ENGINE=INNODB;
 CREATE TABLE test.t2 (a INT AUTO_INCREMENT KEY, f INT, FOREIGN KEY(a) REFERENCES test.t1(a) ON DELETE CASCADE) ENGINE=INNODB;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp003.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp003.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp003.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp005.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp005.result	2011-07-28 08:31:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp005.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result	2011-07-28 08:31:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE PROCEDURE test.p1(IN i INT)
 BEGIN

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp008.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp008.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp008.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp009.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp009.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp009.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp010.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp010.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp010.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp011.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp011.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp011.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp012.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp012.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp012.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 STOP SLAVE;
 SET @my_sql_mode= @@global.sql_mode;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 STOP SLAVE;
 SET @my_sql_mode= @@global.sql_mode;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS `t1`;
 ### TABLE with field_metadata_size == 290

=== modified file 'mysql-test/suite/rpl/r/rpl_row_trig001.result'
--- a/mysql-test/suite/rpl/r/rpl_row_trig001.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_trig001.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE test.t1 (n MEDIUMINT NOT NULL, d DATETIME, PRIMARY KEY(n));
 CREATE TABLE test.t2 (n MEDIUMINT NOT NULL AUTO_INCREMENT, f FLOAT, d DATETIME, PRIMARY KEY(n));

=== modified file 'mysql-test/suite/rpl/r/rpl_row_trig002.result'
--- a/mysql-test/suite/rpl/r/rpl_row_trig002.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_trig002.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TRIGGER test.t2_ai;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_trig003.result'
--- a/mysql-test/suite/rpl/r/rpl_row_trig003.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_trig003.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TRIGGER test.t1_bi;
 DROP TRIGGER test.t2_ai;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_trig004.result'
--- a/mysql-test/suite/rpl/r/rpl_row_trig004.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_trig004.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TRIGGER test.t1_bi_t2;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_trunc_temp.result'
--- a/mysql-test/suite/rpl/r/rpl_row_trunc_temp.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_trunc_temp.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TEMPORARY TABLE t1(c1 INTEGER);
 CREATE TABLE t2(c1 INTEGER);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result'
--- a/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (a INT, b INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_utf16.result'
--- a/mysql-test/suite/rpl/r/rpl_row_utf16.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_utf16.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1(c1 CHAR(10) CHARACTER SET utf16 DEFAULT 'ola');
 INSERT INTO t1 VALUES ('abc');

=== modified file 'mysql-test/suite/rpl/r/rpl_row_utf32.result'
--- a/mysql-test/suite/rpl/r/rpl_row_utf32.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_utf32.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET SQL_LOG_BIN=0;
 CREATE TABLE t1 (c1 char(255) DEFAULT NULL, KEY c1 (c1)) DEFAULT CHARSET=utf32;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_view01.result'
--- a/mysql-test/suite/rpl/r/rpl_row_view01.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_view01.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database if not exists mysqltest1;
 DROP VIEW IF EXISTS mysqltest1.v1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_wide_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_wide_table.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_wide_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t300;
 create table t300 (

=== modified file 'mysql-test/suite/rpl/r/rpl_savepoint.result'
--- a/mysql-test/suite/rpl/r/rpl_savepoint.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_savepoint.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #
 # Bug#50124 Rpl failure on DROP table with concurrent txn/non-txn

=== modified file 'mysql-test/suite/rpl/r/rpl_seconds_behind_master.result'
--- a/mysql-test/suite/rpl/r/rpl_seconds_behind_master.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_seconds_behind_master.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @old_debug= @@global.debug;
 call mtr.add_suppression('Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT');

=== modified file 'mysql-test/suite/rpl/r/rpl_semi_sync.result'
--- a/mysql-test/suite/rpl/r/rpl_semi_sync.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #
 # Uninstall semi-sync plugins on master and slave
@@ -314,6 +317,9 @@ set sql_log_bin=1;
 grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';
 flush privileges;
 change master to master_user='rpl',master_password='rpl';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 show status like 'Rpl_semi_sync_slave_status';
 Variable_name	Value
@@ -442,6 +448,9 @@ include/stop_slave.inc
 UNINSTALL PLUGIN rpl_semi_sync_slave;
 UNINSTALL PLUGIN rpl_semi_sync_master;
 change master to master_user='root',master_password='';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 drop table t1;
 drop user rpl@stripped;

=== modified file 'mysql-test/suite/rpl/r/rpl_semi_sync_event.result'
--- a/mysql-test/suite/rpl/r/rpl_semi_sync_event.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_event.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 include/start_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_sequential.result'
--- a/mysql-test/suite/rpl/r/rpl_sequential.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sequential.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @save.mts_slave_parallel_workers= 0;
 select @@global.slave_parallel_workers as 'zero';

=== modified file 'mysql-test/suite/rpl/r/rpl_server_id1.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/rpl_init.inc [topology=2->2]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 START SLAVE;
 include/wait_for_slave_io_error.inc [errno=1593]
 Last_IO_Error = 'Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).'

=== modified file 'mysql-test/suite/rpl/r/rpl_server_id2.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id2.result	2011-05-05 23:50:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id2.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (n int);
 reset master;

=== modified file 'mysql-test/suite/rpl/r/rpl_server_id_ignore.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id_ignore.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id_ignore.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 master_id: 1
 stop slave;
@@ -35,6 +38,9 @@ change master to IGNORE_SERVER_IDS= ();
 *** must be empty due to IGNORE_SERVER_IDS empty list ***
 ignore server id list: 
 change master to master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 *** must have caught create table ***
 show tables;

=== modified file 'mysql-test/suite/rpl/r/rpl_server_uuid.result'
--- a/mysql-test/suite/rpl/r/rpl_server_uuid.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_uuid.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc [rpl_server_count=3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave I/O thread .* register on master");
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
@@ -45,6 +48,9 @@ CHANGE MASTER TO MASTER_HOST= '127.0.0.1
 MASTER_PORT= MASTER_PORT,
 MASTER_USER= 'root',
 MASTER_LOG_FILE='master-bin.000001';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/check_slave_no_error.inc
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_session_var.result'
--- a/mysql-test/suite/rpl/r/rpl_session_var.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_session_var.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1;
 Warnings:

=== modified file 'mysql-test/suite/rpl/r/rpl_set_charset.result'
--- a/mysql-test/suite/rpl/r/rpl_set_charset.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_set_charset.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1 /*!40100 character set latin2 */;

=== modified file 'mysql-test/suite/rpl/r/rpl_set_null_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_set_null_innodb.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_set_null_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 CREATE TABLE t1 (c1 BIT, c2 INT) Engine=InnoDB;

=== modified file 'mysql-test/suite/rpl/r/rpl_set_null_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_set_null_myisam.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_set_null_myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 CREATE TABLE t1 (c1 BIT, c2 INT) Engine=MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_show_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_show_errors.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_errors.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (a INT, b blob, PRIMARY KEY(b(512)));
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_show_master_info_file.result'
--- a/mysql-test/suite/rpl/r/rpl_show_master_info_file.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_master_info_file.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SELECT "MYSQLTEST_VARDIR/mysqld.2/data/master.info" as Master_Info_File;
 Master_Info_File

=== modified file 'mysql-test/suite/rpl/r/rpl_show_slave_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2011-05-11 14:19:51 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2011-11-07 16:17:30 +0000
@@ -1,7 +1,13 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 RESET SLAVE;
 CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_PORT,master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 START SLAVE IO_THREAD;
 include/wait_for_slave_io_to_start.inc
 SHOW SLAVE HOSTS;

=== modified file 'mysql-test/suite/rpl/r/rpl_show_slave_running.result'
--- a/mysql-test/suite/rpl/r/rpl_show_slave_running.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_running.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET DEBUG_SYNC= 'RESET';
 include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_skip_error.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Test Without sql_mode=strict_trans_tables ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_skip_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_incident.result	2011-03-14 17:09:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_incident.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_grp_exec.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 *** Preparing data ***

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_in.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_in.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_in.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1(a int not null auto_increment, b int, primary key(a));
 create table t2(a int not null auto_increment, b int, primary key(a)) engine=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-09-20 11:07:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write';
 create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result	2011-02-23 09:31:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 START SLAVE;
 call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory.* Error_code: 12");

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_skip.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_skip.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 **** On Slave ****
 STOP SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_start.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_start.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_start.result	2011-11-07 16:17:30 +0000
@@ -3,6 +3,9 @@
 # START SLAVE released the lock and returned before it cleared the error,
 # so there is a possibility that Slave_SQL_Error is not 0.
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 [on slave]
 CALL mtr.add_suppression("Slave: Table 't1' already exists Error_code: 1050");

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_status.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_status.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_status.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Create new replication user ====
 [on master]
@@ -6,6 +9,9 @@ GRANT REPLICATION SLAVE ON *.* TO rpl@12
 [on slave]
 include/stop_slave.inc
 CHANGE MASTER TO master_user='rpl', master_password='rpl';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 ==== Do replication as new user ====
 [on master]
@@ -30,6 +36,9 @@ include/wait_for_slave_io_error.inc [err
 ==== Cleanup (Note that slave IO thread is not running) ====
 include/stop_slave_sql.inc
 CHANGE MASTER TO MASTER_USER = 'root', MASTER_PASSWORD = '';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_reset.inc
 [on master]
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_slow_query_log.result'
--- a/mysql-test/suite/rpl/r/rpl_slow_query_log.result	2011-03-17 13:20:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slow_query_log.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");

=== modified file 'mysql-test/suite/rpl/r/rpl_sp.result'
--- a/mysql-test/suite/rpl/r/rpl_sp.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sp.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_sp004.result'
--- a/mysql-test/suite/rpl/r/rpl_sp004.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sp004.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;

=== modified file 'mysql-test/suite/rpl/r/rpl_sp_effects.result'
--- a/mysql-test/suite/rpl/r/rpl_sp_effects.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sp_effects.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 drop procedure if exists p1;

=== modified file 'mysql-test/suite/rpl/r/rpl_spec_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_spec_variables.result	2011-08-26 11:16:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_spec_variables.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 * auto_increment_increment, auto_increment_offset *

=== modified file 'mysql-test/suite/rpl/r/rpl_sporadic_master.result'
--- a/mysql-test/suite/rpl/r/rpl_sporadic_master.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sporadic_master.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t2(n int);
 create table t1(n int not null auto_increment primary key);

=== modified file 'mysql-test/suite/rpl/r/rpl_ssl.result'
--- a/mysql-test/suite/rpl/r/rpl_ssl.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ssl.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 grant replication slave on *.* to replssl@localhost require ssl;
 create table t1 (t int auto_increment, KEY(t));
@@ -10,6 +13,9 @@ master_ssl=1,
 master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem',
 master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem',
 master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 insert into t1 values(1);
 select * from t1;
@@ -42,5 +48,8 @@ master_ssl = 0,
 master_ssl_ca = '',
 master_ssl_cert = '',
 master_ssl_key = '';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 End of 5.0 tests
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_ssl1.result'
--- a/mysql-test/suite/rpl/r/rpl_ssl1.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ssl1.result	2011-11-07 16:17:30 +0000
@@ -1,10 +1,16 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 grant replication slave on *.* to replssl@localhost require ssl;
 create table t1 (t int);
 stop slave;
 include/wait_for_slave_to_stop.inc
 change master to master_user='replssl',master_password='';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 insert into t1 values (1);
 select * from t1;
@@ -26,6 +32,9 @@ include/check_slave_is_running.inc
 stop slave;
 include/wait_for_slave_to_stop.inc
 change master to master_user='root',master_password='', master_ssl=0;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_to_start.inc
 drop user replssl@localhost;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_EE_err2.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2011-10-18 00:49:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int, unique(a)) engine=myisam;
 set sql_log_bin=0;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
 DROP TABLE IF EXISTS t1, t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Option binlog_cache_size ");

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_conflicts.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_conflicts.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t1 (a int);
 insert into t1 values (10);

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_found_rows.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_found_rows.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_found_rows.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_innodb.result	2011-01-05 05:21:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t4 (
 id INT(5) unsigned NOT NULL auto_increment,

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE SCHEMA IF NOT EXISTS mysqlslap;
 USE mysqlslap;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ******** [ MASTER ] ********
 CREATE DATABASE BUG_37656;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result	2011-10-18 00:49:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result	2011-11-07 16:17:30 +0000
@@ -15,6 +15,9 @@ master-bin.000001	#	Execute_load_query	#
 master-bin.000001	#	Query	#	#	COMMIT
 DROP TABLE t1;
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select last_insert_id();
 last_insert_id()
@@ -55,7 +58,13 @@ load data CONCURRENT infile '../../std_d
 include/wait_for_slave_sql_error.inc [errno=1062]
 include/stop_slave_io.inc
 change master to master_user='test';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/check_slave_no_error.inc
 set global sql_slave_skip_counter=1;
 start slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_loadfile.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_loadfile.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_loadfile.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 include/wait_for_slave_to_stop.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 stop slave;
 #

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	2011-01-14 11:15:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 CREATE TABLE t1 (a INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #########################################################################
 #                            CONFIGURATION

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== 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-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .*");

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_multi_query.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_multi_query.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_multi_query.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database mysqltest;
 create table mysqltest.t1 ( n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_no_op.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_no_op.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_no_op.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create database mysqltest;
 drop database if exists mysqltest;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2011-07-20 10:24:14 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2011-11-07 16:17:30 +0000
@@ -1,15 +1,24 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 Master_User = 'root'
 Master_Host = '127.0.0.1'
 include/stop_slave.inc
 change master to master_user='test';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 Master_User = 'test'
 Master_Host = '127.0.0.1'
 reset slave;
 Master_User = 'test'
 Master_Host = '127.0.0.1'
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 Master_User = 'root'
 Master_Host = '127.0.0.1'
@@ -27,20 +36,32 @@ include/stop_slave.inc
 reset slave;
 include/check_slave_no_error.inc
 change master to master_user='impossible_user_name';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_io_error.inc [errno=1045]
 include/stop_slave_sql.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/check_slave_no_error.inc
 stop slave;
 change master to master_user='impossible_user_name';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 start slave;
 include/wait_for_slave_io_error.inc [errno=1045]
 include/stop_slave_sql.inc
 reset slave;
 include/check_slave_no_error.inc
 change master to master_user='root';
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 reset slave;
 include/start_slave.inc
 include/stop_slave.inc
@@ -48,5 +69,8 @@ reset slave all;
 start slave;
 ERROR HY000: The server is not configured as slave; fix in config file or with CHANGE MASTER TO
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT;
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/start_slave.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_sql_mode.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TABLE t1 (pk integer auto_increment , primary key (pk));
 SET SESSION SQL_MODE='traditional';

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result	2011-03-17 13:20:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @old_innodb_flush_log_at_trx_commit= @@global.innodb_flush_log_at_trx_commit;
 SET @@global.innodb_flush_log_at_trx_commit= 0;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2011-03-29 13:44:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @@session.binlog_direct_non_transactional_updates= FALSE;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_user_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_user_variables.result	2011-07-15 14:41:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_user_variables.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @positive= 18446744073709551615;
 SET @negative= -9223372036854775808;

=== modified file 'mysql-test/suite/rpl/r/rpl_stop_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_stop_slave.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 
 # BUG#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends

=== modified file 'mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result'
--- a/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop database if exists mysqltest1;
 create database mysqltest1;

=== modified file 'mysql-test/suite/rpl/r/rpl_sync.result'
--- a/mysql-test/suite/rpl/r/rpl_sync.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sync.result	2011-11-07 16:17:30 +0000
@@ -1,5 +1,8 @@
 =====Configuring the enviroment=======;
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");

=== modified file 'mysql-test/suite/rpl/r/rpl_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_temp_table.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temp_table.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create table t2 (n int, PRIMARY KEY(n));
 create temporary table t1 (n int);

=== modified file 'mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result'
--- a/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialize ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032");
 reset master;

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Deadlock found");
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_test_framework.result'
--- a/mysql-test/suite/rpl/r/rpl_test_framework.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_test_framework.result	2011-11-07 16:17:30 +0000
@@ -1,9 +1,36 @@
 ==== Create t1 on all servers. ====
 include/rpl_init.inc [topology=1->2->3->4->5->6->7->8->9]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 CREATE TABLE t1 (a INT);
 include/rpl_end.inc
 ==== Test 3-server topologies ====
 include/rpl_init.inc [topology=1 -> 2]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 12'
 [connection server_1]
@@ -16,6 +43,9 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=2 -> 3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 23'
 [connection server_1]
@@ -43,6 +73,12 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->2, 2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 212'
 [connection server_1]
@@ -55,6 +91,12 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 212'
 [connection server_2]
@@ -67,6 +109,12 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=2->1->2]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 212'
 [connection server_1]
@@ -79,6 +127,12 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 123'
 [connection server_1]
@@ -88,6 +142,15 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=2->3->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 323 21'
 [connection server_3]
@@ -97,6 +160,15 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->2,2->3,3->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 23123'
 [connection server_3]
@@ -106,6 +178,15 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->3->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 13213'
 [connection server_3]
@@ -116,6 +197,24 @@ include/diff_tables.inc [server_1:t1,ser
 include/rpl_end.inc
 ==== Test 6-server topologies ====
 include/rpl_init.inc [topology=1->2->3->4->1->5->6]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 341234156'
 [connection server_1]
@@ -125,6 +224,24 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1,server_4:t1,server_5:t1,server_6:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=3->4->5->6->3->1->2]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 4563456 312'
 [connection server_4]
@@ -134,6 +251,21 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1,server_4:t1,server_5:t1,server_6:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=6->5->4->3->2->1]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 65 54 43 32 21'
 [connection server_6]
@@ -143,6 +275,21 @@ include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1,server_2:t1,server_3:t1,server_4:t1,server_5:t1,server_6:t1]
 include/rpl_end.inc
 include/rpl_init.inc [topology=1->2->3->1,4->5->6]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 456 23123'
 [connection server_3]
@@ -156,6 +303,33 @@ include/diff_tables.inc [server_1:t1,ser
 include/rpl_end.inc
 ==== Test 9-server topology ====
 include/rpl_init.inc [topology=1->2, 2->3, 3->4, 4->5, 5->1, 1->6, 6->7, 6->8, 8->9]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 include/rpl_generate_sync_chain.inc
 rpl_sync_chain= ' 345123451689 67'
 [connection server_2]
@@ -166,5 +340,29 @@ include/diff_tables.inc [server_1:t1,ser
 include/rpl_end.inc
 ==== Clean up ====
 include/rpl_init.inc [topology=1->2->3->4->5->6->7->8->9]
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 DROP TABLE t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_timezone.result'
--- a/mysql-test/suite/rpl/r/rpl_timezone.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_timezone.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @my_time_zone= @@global.time_zone;
 set timestamp=100000000;

=== modified file 'mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result'
--- a/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 CREATE TEMPORARY TABLE t1 (a INT);
 CREATE TABLE t2 (a INT, b INT) ENGINE= MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_trigger.result'
--- a/mysql-test/suite/rpl/r/rpl_trigger.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_trigger.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_trunc_temp.result'
--- a/mysql-test/suite/rpl/r/rpl_trunc_temp.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_trunc_temp.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 create temporary table t1 (n int);
 insert into t1 values(1);

=== modified file 'mysql-test/suite/rpl/r/rpl_truncate_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_truncate_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/rpl_reset.inc
 **** On Master ****

=== modified file 'mysql-test/suite/rpl/r/rpl_typeconv.result'
--- a/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @saved_slave_type_conversions = @@global.slave_type_conversions;
 CREATE TABLE type_conversions (

=== modified file 'mysql-test/suite/rpl/r/rpl_typeconv_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 SET @saved_slave_type_conversions = @@GLOBAL.SLAVE_TYPE_CONVERSIONS;
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = '';

=== modified file 'mysql-test/suite/rpl/r/rpl_udf.result'
--- a/mysql-test/suite/rpl/r/rpl_udf.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_udf.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1;
 "*** Test 1) Test UDFs via loadable libraries ***

=== modified file 'mysql-test/suite/rpl/r/rpl_user.result'
--- a/mysql-test/suite/rpl/r/rpl_user.result	2011-08-17 14:07:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_user.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set session sql_log_bin=0;
 delete from mysql.user where Host='fakehost';

=== modified file 'mysql-test/suite/rpl/r/rpl_user_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_user_variables.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_user_variables.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 reset master;
 create table t1(n char(30));

=== modified file 'mysql-test/suite/rpl/r/rpl_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_variables.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_variables.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 ==== Initialization ====
 [on master]

=== modified file 'mysql-test/suite/rpl/r/rpl_variables_stm.result'
--- a/mysql-test/suite/rpl/r/rpl_variables_stm.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_variables_stm.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 ==== Initialization ====

=== modified file 'mysql-test/suite/rpl/r/rpl_view.result'
--- a/mysql-test/suite/rpl/r/rpl_view.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_view.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists t1,v1;
 drop view if exists t1,v1;

=== modified file 'mysql-test/suite/rpl/r/rpl_view_multi.result'
--- a/mysql-test/suite/rpl/r/rpl_view_multi.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_view_multi.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 #
 # Bug #25144 "replication / binlog with view breaks".

=== added file 'mysql-test/suite/rpl/t/rpl_master_connection-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_master_connection-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_master_connection-master.opt	2011-10-02 08:25:38 +0000
@@ -0,0 +1 @@
+$PLUGIN_AUTH_OPT $PLUGIN_AUTH_LOAD

=== added file 'mysql-test/suite/rpl/t/rpl_master_connection-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_master_connection-slave.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_master_connection-slave.opt	2011-10-02 08:25:38 +0000
@@ -0,0 +1 @@
+$PLUGIN_AUTH_OPT $PLUGIN_AUTH_LOAD --master-retry-count=1

=== added file 'mysql-test/suite/rpl/t/rpl_master_connection.test'
--- a/mysql-test/suite/rpl/t/rpl_master_connection.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_master_connection.test	2011-11-04 15:25:28 +0000
@@ -0,0 +1,282 @@
+################################################################################
+# This test case aims to verify if the changes made to the START SLAVE command
+# in the context of the WL#4143 work as specified. The following properties
+# are verified:
+#
+# 0 - This aims at checking syntax.
+#
+# 1 - If START SLAVE works with regular users and different combinations
+#     of USER and PASSWORD.
+#
+# 2 - If START SLAVE USER=xxxx PASSWORD=yyyy works with pluggable users
+#     and different combinations of DEFAULT_AUTH and PLUGIN_DIR.
+#     It is always required to provide a password when pluggable users are
+#     used. The password is the name of the proxy user.
+# 
+# 3 - If START SLAVE works with pluggable users defined in the master info
+#     repository.
+#
+# 4 - The warning message "Sending passwords in plain text without SSL/TLS is"
+#      extremely insecure" is not printed out if a SSL connection is in use.
+################################################################################
+--source include/have_plugin_auth.inc
+--source include/not_embedded.inc
+--source include/master-slave.inc
+--source include/have_openssl.inc
+
+################################################################################
+# 1. Prepare the environment
+################################################################################
+SET SQL_LOG_BIN=0;
+
+--sorted_result
+SELECT user, plugin, authentication_string, password FROM mysql.user WHERE user != 'root';
+
+CREATE USER 'plug_user_p' IDENTIFIED WITH 'test_plugin_server' AS 'proxy_user_p';
+CREATE USER 'plug_user_wp' IDENTIFIED WITH 'test_plugin_server' AS 'proxy_user_wp';
+CREATE USER 'proxy_user_p' IDENTIFIED BY 'password';
+CREATE USER 'proxy_user_wp' IDENTIFIED BY '';
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+
+--sorted_result
+SELECT user, plugin, authentication_string, password FROM mysql.user WHERE user != 'root';
+
+GRANT PROXY ON proxy_user_p to plug_user_p;
+GRANT PROXY ON proxy_user_wp to plug_user_wp;
+GRANT REPLICATION SLAVE ON *.* TO proxy_user_p;
+GRANT REPLICATION SLAVE ON *.* TO proxy_user_wp;
+GRANT REPLICATION SLAVE ON *.* TO regular_user_p;
+GRANT REPLICATION SLAVE ON *.* TO regular_user_wp;
+
+SET SQL_LOG_BIN=1;
+
+###############################################################################
+# 2. Test if different type of users can connect when CHANGE MASTER
+#    START SLAVE are specified
+###############################################################################
+--connection slave
+--let $slave_io_errno= 2059
+--let $show_slave_io_error= 0
+
+#
+# Check Property 0
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--error ER_SQLTHREAD_WITH_SECURE_SALVE
+--eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password'
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--error ER_SQLTHREAD_WITH_SECURE_SALVE
+--eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin'
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--error ER_SQLTHREAD_WITH_SECURE_SALVE
+--eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE IO_THREAD, SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_io_to_start.inc
+--source include/stop_slave_io.inc
+
+#
+# Check Property 1.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'regular_user_p' PASSWORD= 'password'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 1.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'regular_user_wp' PASSWORD= ''
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 1.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'regular_user_p' PASSWORD= 'password'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 1.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'regular_user_wp' PASSWORD= ''
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 1.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'regular_user_wp'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+--replace_result $MASTER_MYSOCK MASTER_MYSOCK $PLUGIN_AUTH_OPT PLUGIN_AUTH_OPT
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+--replace_result $MASTER_MYSOCK MASTER_MYSOCK $PLUGIN_AUTH_OPT PLUGIN_AUTH_OPT
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--eval START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' DEFAULT_AUTH= 'auth_test_plugin'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' DEFAULT_AUTH= 'auth_test_plugin'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_p' PASSWORD= 'proxy_user_p' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 2.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
+--replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
+--eval START SLAVE USER= 'plug_user_wp' PASSWORD= 'proxy_user_wp' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 3.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'plug_user_p', MASTER_PASSWORD= 'proxy_user_p';
+--source include/start_slave.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 3.
+#
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER= 'plug_user_wp', MASTER_PASSWORD= 'proxy_user_wp';
+--source include/start_slave.inc
+--source include/check_slave_is_running.inc
+
+#
+# Check Property 4
+#
+
+--connection slave
+CREATE USER 'ssl_user' IDENTIFIED BY '';
+GRANT ALL ON *.* TO ssl_user REQUIRE SSL;
+--source include/stop_slave.inc
+--replace_result $SLAVE_MYPORT SLAVE_MYPORT
+connect (con_ssl,127.0.0.1,ssl_user,,test,$SLAVE_MYPORT,,SSL);
+--connection con_ssl
+CHANGE MASTER TO MASTER_USER= 'root', MASTER_PASSWORD = '';
+--source include/start_slave.inc
+
+--source include/stop_slave.inc
+--eval START SLAVE USER= 'root' PASSWORD= ''
+--source include/wait_for_slave_to_start.inc
+--source include/check_slave_is_running.inc
+
+################################################################################
+# 3. Clean the environment
+################################################################################
+--connection master
+SET SQL_LOG_BIN=0;
+DROP USER plug_user_p, plug_user_wp, regular_user_p, regular_user_wp, proxy_user_p, proxy_user_wp;
+SET SQL_LOG_BIN=1;
+
+--connection slave
+DROP USER ssl_user;
+disconnect con_ssl;
+
+--source include/rpl_end.inc

=== modified file 'mysql-test/suite/sys_vars/r/relay_log_basename_basic.result'
--- a/mysql-test/suite/sys_vars/r/relay_log_basename_basic.result	2011-07-04 15:55:00 +0000
+++ b/mysql-test/suite/sys_vars/r/relay_log_basename_basic.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select @@global.relay_log_basename;
 @@global.relay_log_basename

=== modified file 'mysql-test/suite/sys_vars/r/relay_log_index_basic.result'
--- a/mysql-test/suite/sys_vars/r/relay_log_index_basic.result	2011-07-04 15:55:00 +0000
+++ b/mysql-test/suite/sys_vars/r/relay_log_index_basic.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 select @@global.relay_log_index;
 @@global.relay_log_index

=== modified file 'mysql-test/suite/sys_vars/r/rpl_init_slave_func.result'
--- a/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result	2011-11-07 16:17:30 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1755	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 connection slave
 SET @start_max_connections= @@global.max_connections;

=== modified file 'mysql-test/t/rewrite_general_log.test'
--- a/mysql-test/t/rewrite_general_log.test	2011-08-19 00:45:28 +0000
+++ b/mysql-test/t/rewrite_general_log.test	2011-11-09 10:07:45 +0000
@@ -33,7 +33,9 @@ GRANT ALL on *.* TO test_user1 IDENTIFIE
 CREATE USER test_user2 IDENTIFIED BY 'azundris2';
 
 # 1.1.1.3
+--disable_warnings
 CHANGE MASTER TO MASTER_PASSWORD='azundris3';
+--enable_warnings
 
 # 1.1.1.4
 CREATE USER 'test_user4'@'localhost';

=== modified file 'sql/lex.h'
--- a/sql/lex.h	2011-08-29 14:33:10 +0000
+++ b/sql/lex.h	2011-11-04 16:07:37 +0000
@@ -165,6 +165,7 @@ static SYMBOL symbols[] = {
   { "DECIMAL",		SYM(DECIMAL_SYM)},
   { "DECLARE",          SYM(DECLARE_SYM)},
   { "DEFAULT",		SYM(DEFAULT)},
+  { "DEFAULT_AUTH",	SYM(DEFAULT_AUTH_SYM)},
   { "DEFINER",          SYM(DEFINER_SYM)},
   { "DELAYED",		SYM(DELAYED_SYM)},
   { "DELAY_KEY_WRITE",	SYM(DELAY_KEY_WRITE_SYM)},
@@ -418,6 +419,7 @@ static SYMBOL symbols[] = {
   { "PHASE",            SYM(PHASE_SYM)},
   { "PLUGIN",           SYM(PLUGIN_SYM)},
   { "PLUGINS",          SYM(PLUGINS_SYM)},
+  { "PLUGIN_DIR",       SYM(PLUGIN_DIR_SYM)},
   { "POINT",		SYM(POINT_SYM)},
   { "POLYGON",		SYM(POLYGON)},
   { "PORT",		SYM(PORT_SYM)},

=== modified file 'sql/rpl_handler.cc'
--- a/sql/rpl_handler.cc	2011-06-30 15:50:45 +0000
+++ b/sql/rpl_handler.cc	2011-10-02 08:25:38 +0000
@@ -429,7 +429,7 @@ void Binlog_relay_IO_delegate::init_para
                                           Master_info *mi)
 {
   param->mysql= mi->mysql;
-  param->user= mi->user;
+  param->user= const_cast<char *>(mi->get_user());
   param->host= mi->host;
   param->port= mi->port;
   param->master_log_name= const_cast<char *>(mi->get_master_log_name());

=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2011-10-28 12:45:35 +0000
+++ b/sql/rpl_mi.cc	2011-11-04 16:07:37 +0000
@@ -106,6 +106,7 @@ Master_info::Master_info(
              param_key_info_stop_cond, param_key_info_sleep_cond
 #endif
             ),
+   start_user_configured(false),
    ssl(0), ssl_verify_server_cert(0),
    port(MYSQL_PORT), connect_retry(DEFAULT_CONNECT_RETRY),
    clock_diff_with_master(0), heartbeat_period(0),
@@ -113,11 +114,14 @@ Master_info::Master_info(
    checksum_alg_before_fd(BINLOG_CHECKSUM_ALG_UNDEF),
    retry_count(master_retry_count)
 {
-  host[0] = 0; user[0] = 0; password[0] = 0; bind_addr[0] = 0;
+  host[0] = 0; user[0] = 0; bind_addr[0] = 0;
+  password[0]= 0; start_password[0]= 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
   ssl_cipher[0]= 0; ssl_key[0]= 0;
   ssl_crl[0]= 0; ssl_crlpath[0]= 0;
   master_uuid[0]= 0;
+  start_plugin_auth[0]= 0; start_plugin_dir[0]= 0;
+  start_user[0]= 0;
   ignore_server_ids= new Server_ids(sizeof(::server_id));
 }
 
@@ -398,7 +402,7 @@ bool Master_info::read_info(Rpl_info_han
   */
   if (lines >= LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT)
   { 
-    if (from->get_info(&temp_ssl_verify_server_cert, 0))
+    if (from->get_info(&temp_ssl_verify_server_cert, (int) 0))
       DBUG_RETURN(TRUE);
   }
 
@@ -506,4 +510,54 @@ bool Master_info::write_info(Rpl_info_ha
 
   DBUG_RETURN(FALSE);
 }
+
+bool Master_info::set_password(const char* password_arg,
+                               int password_arg_size __attribute__((unused)))
+{
+  bool ret= true;
+  DBUG_ENTER("Master_info::set_password");
+
+  if (password_arg && start_user_configured)
+  {
+    strmake(start_password, password_arg, sizeof(start_password) - 1);
+    ret= false;
+  }
+  else if (password_arg)
+  {
+    strmake(password, password_arg, sizeof(password) - 1);
+    ret= false;
+  }
+  DBUG_RETURN(ret);
+}
+
+bool Master_info::get_password(char *password_arg, int *password_arg_size)
+{
+  bool ret= true;
+  DBUG_ENTER("Master_info::get_password");
+
+  if (password_arg && start_user_configured)
+  {
+    *password_arg_size= strlen(start_password);
+    strmake(password_arg, start_password, sizeof(start_password) - 1);
+    ret= false;
+  }
+  else if (password_arg)
+  {
+    *password_arg_size= strlen(password);
+    strmake(password_arg, password, sizeof(password) - 1);
+    ret= false;
+  }
+  DBUG_RETURN(ret);
+}
+
+void Master_info::reset_start_info()
+{
+  DBUG_ENTER("Master_info::reset_start_info");
+  start_plugin_auth[0]= 0;
+  start_plugin_dir[0]= 0;
+  start_user_configured= false;
+  start_user[0]= 0;
+  start_password[0]= 0;
+  DBUG_VOID_RETURN;
+}
 #endif /* HAVE_REPLICATION */

=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2011-08-19 18:16:46 +0000
+++ b/sql/rpl_mi.h	2011-10-02 08:25:38 +0000
@@ -66,10 +66,181 @@ class Master_info : public Rpl_info
 friend class Rpl_info_factory;
 
 public:
-  /* the variables below are needed because we can change masters on the fly */
-  char host[HOSTNAME_LENGTH+1];
-  char user[USERNAME_LENGTH+1];
-  char password[MAX_PASSWORD_LENGTH+1];
+  /**
+    Host name or ip address stored in the master.info.
+  */
+  char host[HOSTNAME_LENGTH + 1];
+
+private:
+  /**
+    If true, USER/PASSWORD was specified when running START SLAVE.
+  */
+  bool start_user_configured;
+  /**
+    User's name stored in the master.info.
+  */
+  char user[USERNAME_LENGTH + 1];
+  /**
+    User's password stored in the master.info.
+  */
+  char password[MAX_PASSWORD_LENGTH + 1]; 
+  /**
+    User specified when running START SLAVE.
+  */
+  char start_user[USERNAME_LENGTH + 1];
+  /**
+    Password specified when running START SLAVE.
+  */
+  char start_password[MAX_PASSWORD_LENGTH + 1]; 
+  /**
+    Stores the autentication plugin specified when running START SLAVE.
+  */
+  char start_plugin_auth[FN_REFLEN + 1];
+  /**
+    Stores the autentication plugin directory specified when running
+    START SLAVE.
+  */
+  char start_plugin_dir[FN_REFLEN + 1];
+
+public:
+  /**
+    Returns if USER/PASSWORD was specified when running
+    START SLAVE.
+
+    @return true or false.
+  */
+  bool is_start_user_configured() const
+  {
+    return start_user_configured;
+  }
+  /**
+    Returns if DEFAULT_AUTH was specified when running START SLAVE.
+
+    @return true or false.
+  */
+  bool is_start_plugin_auth_configured() const
+  {
+    return (start_plugin_auth[0] != 0);
+  }
+  /**
+    Returns if PLUGIN_DIR was specified when running START SLAVE.
+
+    @return true or false.
+  */
+  bool is_start_plugin_dir_configured() const
+  {
+    return (start_plugin_dir[0] != 0);
+  }
+  /**
+    Defines that USER/PASSWORD was specified or not when running
+    START SLAVE.
+
+    @param config is true or false.
+  */
+  void set_start_user_configured(bool config)
+  {
+    start_user_configured= config;
+  }
+  /**
+    Sets either user's name in the master.info repository when CHANGE
+    MASTER is executed or user's name used in START SLAVE if USER is
+    specified.
+
+    @param user_arg is user's name.
+  */
+  void set_user(const char* user_arg)
+  {
+    if (user_arg && start_user_configured)
+    {
+      strmake(start_user, user_arg, sizeof(start_user) - 1);
+    }
+    else if (user_arg)
+    {
+      strmake(user, user_arg, sizeof(user) - 1);
+    }
+  }
+  /*
+    Returns user's size name. See @code get_user().
+
+    @return user's size name.
+  */
+  size_t get_user_size() const
+  {
+    return (start_user_configured ? sizeof(start_user) : sizeof(user));
+  }
+  /**
+    If an user was specified when running START SLAVE, this function returns
+    such user. Otherwise, it returns the user stored in master.info.
+
+    @return user's name.
+  */
+  const char *get_user() const
+  {
+    return start_user_configured ? start_user : user;
+  } 
+  /**
+    Stores either user's password in the master.info repository when CHANGE
+    MASTER is executed or user's password used in START SLAVE if PASSWORD
+    is specified.
+
+    @param password_arg is user's password.
+    @param password_arg_size is password's size.
+
+    @return false if there is no error, otherwise true is returned.
+  */
+  bool set_password(const char* password_arg, int password_arg_size);
+  /**
+    Returns either user's password in the master.info repository or
+    user's password used in START SLAVE.
+
+    @param password_arg is user's password.
+
+    @return false if there is no error, otherwise true is returned.
+  */
+  bool get_password(char *password_arg, int *password_arg_size);
+  /**
+    Cleans in-memory password defined by START SLAVE.
+  */
+  void reset_start_info();
+  /**
+    Returns the DEFAULT_AUTH defined by START SLAVE.
+
+    @return DEFAULT_AUTH.
+  */
+  const char *get_start_plugin_auth()
+  {
+    return start_plugin_auth;
+  }
+  /**
+    Returns the PLUGIN_DIR defined by START SLAVE.
+
+    @return PLUGIN_DIR.
+  */
+  const char *get_start_plugin_dir()
+  {
+    return start_plugin_dir;
+  }
+  /**
+    Stores the DEFAULT_AUTH defined by START SLAVE.
+
+    @param DEFAULT_AUTH.
+  */
+  void set_plugin_auth(const char* src)
+  {
+    if (src)
+      strmake(start_plugin_auth, src, sizeof(start_plugin_auth) - 1);
+  }
+  /**
+    Stores the DEFAULT_AUTH defined by START SLAVE.
+
+    @param DEFAULT_AUTH.
+  */
+  void set_plugin_dir(const char* src)
+  {
+    if (src)
+      strmake(start_plugin_dir, src, sizeof(start_plugin_dir) - 1);
+  }
+
   my_bool ssl; // enables use of SSL connection if true
   char ssl_ca[FN_REFLEN], ssl_capath[FN_REFLEN], ssl_cert[FN_REFLEN];
   char ssl_cipher[FN_REFLEN], ssl_key[FN_REFLEN];

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-11-10 06:53:27 +0000
+++ b/sql/rpl_slave.cc	2011-11-11 10:06:39 +0000
@@ -2142,7 +2142,7 @@ bool show_master_info(THD* thd, Master_i
   field_list.push_back(new Item_empty_string("Master_Host",
                                                      sizeof(mi->host)));
   field_list.push_back(new Item_empty_string("Master_User",
-                                                     sizeof(mi->user)));
+                                                     mi->get_user_size()));
   field_list.push_back(new Item_return_int("Master_Port", 7,
                                            MYSQL_TYPE_LONG));
   field_list.push_back(new Item_return_int("Connect_Retry", 10,
@@ -2247,7 +2247,7 @@ bool show_master_info(THD* thd, Master_i
     mysql_mutex_lock(&mi->rli->err_lock);
 
     protocol->store(mi->host, &my_charset_bin);
-    protocol->store(mi->user, &my_charset_bin);
+    protocol->store(mi->get_user(), &my_charset_bin);
     protocol->store((uint32) mi->port);
     protocol->store((uint32) mi->connect_retry);
     protocol->store(mi->get_master_log_name(), &my_charset_bin);
@@ -3448,7 +3448,7 @@ pthread_handler_t handle_slave_io(void *
   {
     sql_print_information("Slave I/O thread: connected to master '%s@%s:%d',"
                           "replication started in log '%s' at position %s",
-                          mi->user, mi->host, mi->port,
+                          mi->get_user(), mi->host, mi->port,
 			  mi->get_io_rpl_log_name(),
 			  llstr(mi->get_master_log_pos(), llbuff));
   /*
@@ -3730,7 +3730,11 @@ err:
   write_ignored_events_info_to_relay_log(thd, mi);
   THD_STAGE_INFO(thd, stage_waiting_for_slave_mutex_on_exit);
   mysql_mutex_lock(&mi->run_lock);
-
+  /*
+    Clean information used to start slave in order to avoid
+    security issues.
+  */
+  mi->reset_start_info();
   /* Forget the relay log's format */
   delete mi->rli->relay_log.description_event_for_queue;
   mi->rli->relay_log.description_event_for_queue= 0;
@@ -5801,10 +5805,12 @@ static int safe_connect(THD* thd, MYSQL*
 static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
                              bool reconnect, bool suppress_warnings)
 {
-  int slave_was_killed;
+  int slave_was_killed= 0;
   int last_errno= -2;                           // impossible error
   ulong err_count=0;
   char llbuff[22];
+  char password[MAX_PASSWORD_LENGTH + 1];
+  int password_size= sizeof(password);
   DBUG_ENTER("connect_to_master");
 
 #ifndef DBUG_OFF
@@ -5845,14 +5851,39 @@ static int connect_to_master(THD* thd, M
   /* This one is not strictly needed but we have it here for completeness */
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
 
+  if (mi->is_start_plugin_auth_configured())
+  {
+    DBUG_PRINT("info", ("Slaving is using MYSQL_DEFAULT_AUTH %s",
+                        mi->get_start_plugin_auth()));
+    mysql_options(mysql, MYSQL_DEFAULT_AUTH, mi->get_start_plugin_auth());
+  }
+  
+  if (mi->is_start_plugin_dir_configured())
+  {
+    DBUG_PRINT("info", ("Slaving is using MYSQL_PLUGIN_DIR %s",
+                        mi->get_start_plugin_dir()));
+    mysql_options(mysql, MYSQL_PLUGIN_DIR, mi->get_start_plugin_dir());
+  }
   /* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */
-  if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
-    mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
+  else if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
+    mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
+  
+  if (!mi->is_start_user_configured())
+    sql_print_warning("%s", ER(ER_INSECURE_CHANGE_MASTER));
 
-  while (!(slave_was_killed = io_slave_killed(thd,mi)) &&
-         (reconnect ? mysql_reconnect(mysql) != 0 :
-          mysql_real_connect(mysql, mi->host, mi->user, mi->password, 0,
-                             mi->port, 0, client_flag) == 0))
+  if (mi->get_password(password, &password_size))
+  {
+    mi->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+               ER(ER_SLAVE_FATAL_ERROR),
+               "Unable to configure password when attempting to "
+               "connect to the master server. Connection attempt "
+               "terminated.");
+    DBUG_RETURN(1);
+  }
+  while (!(slave_was_killed = io_slave_killed(thd,mi))
+         && (reconnect ? mysql_reconnect(mysql) != 0 :
+             mysql_real_connect(mysql, mi->host, mi->get_user(),
+                                password, 0, mi->port, 0, client_flag) == 0))
   {
     /*
        SHOW SLAVE STATUS will display the number of retries which
@@ -5865,7 +5896,7 @@ static int connect_to_master(THD* thd, M
                "error %s to master '%s@%s:%d'"
                " - retry-time: %d  retries: %lu",
                (reconnect ? "reconnecting" : "connecting"),
-               mi->user, mi->host, mi->port,
+               mi->get_user(), mi->host, mi->port,
                mi->connect_retry, err_count + 1);
     /*
       By default we try forever. The reason is that failure will trigger
@@ -5888,7 +5919,7 @@ static int connect_to_master(THD* thd, M
     {
       if (!suppress_warnings && log_warnings)
         sql_print_information("Slave: connected to master '%s@%s:%d',\
-replication resumed in log '%s' at position %s", mi->user,
+replication resumed in log '%s' at position %s", mi->get_user(),
                         mi->host, mi->port,
                         mi->get_io_rpl_log_name(),
                         llstr(mi->get_master_log_pos(),llbuff));
@@ -5896,7 +5927,7 @@ replication resumed in log '%s' at posit
     else
     {
       general_log_print(thd, COM_CONNECT_OUT, "%s@%s:%d",
-                        mi->user, mi->host, mi->port);
+                        mi->get_user(), mi->host, mi->port);
     }
 #ifdef SIGNAL_WITH_VIO_CLOSE
     thd->set_active_vio(mysql->net.vio);
@@ -5927,6 +5958,8 @@ static int safe_reconnect(THD* thd, MYSQ
 MYSQL *rpl_connect_master(MYSQL *mysql)
 {
   THD *thd= current_thd;
+  char password[MAX_PASSWORD_LENGTH + 1];
+  int password_size= sizeof(password);
   Master_info *mi= my_pthread_getspecific_ptr(Master_info*, RPL_MASTER_INFO);
   if (!mi)
   {
@@ -5984,9 +6017,30 @@ MYSQL *rpl_connect_master(MYSQL *mysql)
   /* This one is not strictly needed but we have it here for completeness */
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
 
-  if (io_slave_killed(thd, mi)
-      || !mysql_real_connect(mysql, mi->host, mi->user, mi->password, 0,
-                             mi->port, 0, 0))
+  if (mi->is_start_plugin_auth_configured())
+  {
+    DBUG_PRINT("info", ("Slaving is using MYSQL_DEFAULT_AUTH %s",
+                        mi->get_start_plugin_auth()));
+    mysql_options(mysql, MYSQL_DEFAULT_AUTH, mi->get_start_plugin_auth());
+  }
+
+  if (mi->is_start_plugin_dir_configured())
+  {
+    DBUG_PRINT("info", ("Slaving is using MYSQL_PLUGIN_DIR %s",
+                        mi->get_start_plugin_dir()));
+    mysql_options(mysql, MYSQL_PLUGIN_DIR, mi->get_start_plugin_dir());
+  }
+  /* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */
+  else if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
+    mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
+
+  if (!mi->is_start_user_configured())
+    sql_print_warning("%s", ER(ER_INSECURE_CHANGE_MASTER));
+
+  if (mi->get_password(password, &password_size)
+      || io_slave_killed(thd, mi)
+      || !mysql_real_connect(mysql, mi->host, mi->get_user(),
+                             password, 0, mi->port, 0, 0))
   {
     if (!io_slave_killed(thd, mi))
       sql_print_error("rpl_connect_master: error connecting to master: %s (server_error: %d)",
@@ -6725,6 +6779,23 @@ int start_slave(THD* thd , Master_info*
 
   if (check_access(thd, SUPER_ACL, any_db, NULL, NULL, 0, 0))
     DBUG_RETURN(1);
+
+  if (thd->lex->slave_connection.user ||
+      thd->lex->slave_connection.password)
+  {
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+    if (thd->vio_ok() && !thd->net.vio->ssl_arg)
+      push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
+                   ER_INSECURE_PLAIN_TEXT,
+                   ER(ER_INSECURE_PLAIN_TEXT));
+#endif
+#if !defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+    push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
+                 ER_INSECURE_PLAIN_TEXT,
+                 ER(ER_INSECURE_PLAIN_TEXT));
+#endif
+  }
+
   lock_slave_threads(mi);  // this allows us to cleanly read slave_running
   // Get a mask of _stopped_ threads
   init_thread_mask(&thread_mask,mi,1 /* inverse */);
@@ -6743,6 +6814,29 @@ int start_slave(THD* thd , Master_info*
     else if (server_id_supplied && *mi->host)
     {
       /*
+        If we will start IO thread we need to take care of possible
+        options provided through the START SLAVE if there is any.
+      */
+      if (thread_mask & SLAVE_IO)
+      {
+        if (thd->lex->slave_connection.user)
+        {
+          mi->set_start_user_configured(true);
+          mi->set_user(thd->lex->slave_connection.user);
+        }
+        if (thd->lex->slave_connection.password)
+        {
+          mi->set_start_user_configured(true);
+          mi->set_password(thd->lex->slave_connection.password,
+                           strlen(thd->lex->slave_connection.password));
+        }
+        if (thd->lex->slave_connection.plugin_auth)
+          mi->set_plugin_auth(thd->lex->slave_connection.plugin_auth);
+        if (thd->lex->slave_connection.plugin_dir)
+          mi->set_plugin_dir(thd->lex->slave_connection.plugin_dir);
+      }
+ 
+      /*
         If we will start SQL thread we will care about UNTIL options If
         not and they are specified we will ignore them and warn user
         about this fact.
@@ -6851,6 +6945,14 @@ int start_slave(THD* thd , Master_info*
                  ER(ER_SLAVE_WAS_RUNNING));
   }
 
+  /*
+    Clean up start information if there was an attempt to start
+    the IO thread to avoid any security issue.
+  */
+  if (slave_errno &&
+      (thread_mask & SLAVE_IO) == SLAVE_IO)
+    mi->reset_start_info();
+
   unlock_slave_threads(mi);
 
   if (slave_errno)
@@ -7086,14 +7188,45 @@ bool change_master(THD* thd, Master_info
   }
   DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->get_master_log_pos()));
 
+  if (lex_mi->user || lex_mi->password)
+  {
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+    if (thd->vio_ok() && !thd->net.vio->ssl_arg)
+      push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
+                   ER_INSECURE_PLAIN_TEXT,
+                   ER(ER_INSECURE_PLAIN_TEXT));
+#endif
+#if !defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+    push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
+                 ER_INSECURE_PLAIN_TEXT,
+                 ER(ER_INSECURE_PLAIN_TEXT));
+#endif
+    push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
+                 ER_INSECURE_CHANGE_MASTER,
+                 ER(ER_INSECURE_CHANGE_MASTER));
+  }
+
+  if (lex_mi->user)
+    mi->set_user(lex_mi->user);
+
+  if (lex_mi->password)
+  {
+    if (mi->set_password(lex_mi->password, strlen(lex_mi->password)))
+    {
+      /*
+        After implementing WL#5769, we should create a better error message
+        to denote that the call may have failed due to an error while trying
+        to encrypt/store the password in a secure key store.
+      */
+      my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
+      ret= false;
+      goto err;
+    }
+  }
   if (lex_mi->host)
     strmake(mi->host, lex_mi->host, sizeof(mi->host)-1);
   if (lex_mi->bind_addr)
     strmake(mi->bind_addr, lex_mi->bind_addr, sizeof(mi->bind_addr)-1);
-  if (lex_mi->user)
-    strmake(mi->user, lex_mi->user, sizeof(mi->user)-1);
-  if (lex_mi->password)
-    strmake(mi->password, lex_mi->password, sizeof(mi->password)-1);
   if (lex_mi->port)
     mi->port = lex_mi->port;
   if (lex_mi->connect_retry)

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-11-09 10:55:44 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-11-11 10:06:39 +0000
@@ -6598,3 +6598,12 @@ ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITION
 ER_DA_INVALID_CONDITION_NUMBER 35000
   eng "Invalid condition number"
   por "Número de condição inválido"
+
+ER_INSECURE_PLAIN_TEXT
+  eng "Sending passwords in plain text without SSL/TLS is extremely insecure."
+
+ER_INSECURE_CHANGE_MASTER
+  eng "Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives."
+
+ER_SQLTHREAD_WITH_SECURE_SALVE
+  eng "Setting authentication options is not possible when only the Slave SQL Thread is being started."

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2011-10-13 12:33:08 +0000
+++ b/sql/sql_lex.h	2011-11-04 16:07:37 +0000
@@ -1028,6 +1028,14 @@ private:
   Alter_info(const Alter_info &rhs);            // not implemented
 };
 
+typedef struct struct_slave_connection
+{
+  char *user;
+  char *password;
+  char *plugin_auth;
+  char *plugin_dir;
+} LEX_SLAVE_CONNECTION;
+
 struct st_sp_chistics
 {
   LEX_STRING comment;
@@ -2189,6 +2197,7 @@ struct LEX: public Query_tables_list
   HA_CREATE_INFO create_info;
   KEY_CREATE_INFO key_create_info;
   LEX_MASTER_INFO mi;				// used by CHANGE MASTER
+  LEX_SLAVE_CONNECTION slave_connection;
   LEX_SERVER_OPTIONS server_options;
   USER_RESOURCES mqh;
   LEX_RESET_SLAVE reset_slave_info;

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-10-28 12:45:35 +0000
+++ b/sql/sql_yacc.yy	2011-11-04 16:07:37 +0000
@@ -987,6 +987,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  DECIMAL_SYM                   /* SQL-2003-R */
 %token  DECLARE_SYM                   /* SQL-2003-R */
 %token  DEFAULT                       /* SQL-2003-R */
+%token  DEFAULT_AUTH_SYM              /* INTERNAL */
 %token  DEFINER_SYM
 %token  DELAYED_SYM
 %token  DELAY_KEY_WRITE_SYM
@@ -1249,8 +1250,9 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  PARTITIONING_SYM
 %token  PASSWORD
 %token  PHASE_SYM
-%token  PLUGINS_SYM
+%token  PLUGIN_DIR_SYM                /* INTERNAL */
 %token  PLUGIN_SYM
+%token  PLUGINS_SYM
 %token  POINT_SYM
 %token  POLYGON
 %token  PORT_SYM
@@ -7188,6 +7190,23 @@ slave:
           }
           slave_until
           {}
+          slave_connection_opts
+          {
+            /*
+              It is not possible to set user's information when
+              one is trying to start the SQL Thread.
+            */
+            if ((Lex->slave_thd_opt & SLAVE_SQL) == SLAVE_SQL &&
+                (Lex->slave_thd_opt & SLAVE_IO) != SLAVE_IO &&
+                (Lex->slave_connection.user ||
+                 Lex->slave_connection.password ||
+                 Lex->slave_connection.plugin_auth ||
+                 Lex->slave_connection.plugin_dir))
+            {
+              my_error(ER_SQLTHREAD_WITH_SECURE_SALVE, MYF(0));
+              MYSQL_YYABORT;
+            }
+          }
         | STOP_SYM SLAVE slave_thread_opts
           {
             LEX *lex=Lex;
@@ -7214,6 +7233,50 @@ start_transaction_opts:
           }
         ;
 
+slave_connection_opts:
+          slave_user_name_opt slave_user_pass_opt
+          slave_plugin_auth_opt slave_plugin_dir_opt
+        ;
+
+slave_user_name_opt:
+          {
+            Lex->slave_connection.user= 0;
+          }
+        | USER EQ TEXT_STRING_sys
+          {
+            Lex->slave_connection.user= $3.str;
+          }
+        ;
+
+slave_user_pass_opt:
+          {
+            Lex->slave_connection.password= 0;
+          }
+        | PASSWORD EQ TEXT_STRING_sys
+          {
+            Lex->slave_connection.password= $3.str;
+          }
+
+slave_plugin_auth_opt:
+          {
+            Lex->slave_connection.plugin_auth= 0;
+          }
+        | DEFAULT_AUTH_SYM EQ TEXT_STRING_sys
+          {
+            Lex->slave_connection.plugin_auth= $3.str;
+          }
+        ;
+
+slave_plugin_dir_opt:
+          {
+            Lex->slave_connection.plugin_dir= 0;
+          }
+        | PLUGIN_DIR_SYM EQ TEXT_STRING_sys
+          {
+            Lex->slave_connection.plugin_dir= $3.str;
+          }
+        ;
+
 slave_thread_opts:
           { Lex->slave_thd_opt= 0; }
           slave_thread_opt_list
@@ -12940,6 +13003,7 @@ keyword_sp:
         | DATETIME                 {}
         | DATE_SYM                 {}
         | DAY_SYM                  {}
+        | DEFAULT_AUTH_SYM         {}
         | DEFINER_SYM              {}
         | DELAY_KEY_WRITE_SYM      {}
         | DES_KEY_FILE             {}
@@ -13068,6 +13132,7 @@ keyword_sp:
         | PARTITIONS_SYM           {}
         | PASSWORD                 {}
         | PHASE_SYM                {}
+        | PLUGIN_DIR_SYM           {}
         | PLUGIN_SYM               {}
         | PLUGINS_SYM              {}
         | POINT_SYM                {}

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (luis.soares:3597 to 3598) WL#4143Luis Soares11 Nov