diff options
author | unknown <bar@bar.mysql.r18.ru> | 2003-03-18 11:34:19 +0400 |
---|---|---|
committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-18 11:34:19 +0400 |
commit | 2dae38c71357665601f9eb8bc4186fa9be6d4dee (patch) | |
tree | f8469e8b44aa1d821827236254dc5c79f587ca92 /sql/repl_failsafe.cc | |
parent | 1159272c28c83e4915beb67c296103a06875d198 (diff) | |
download | mariadb-git-2dae38c71357665601f9eb8bc4186fa9be6d4dee.tar.gz |
Replication were broken because of automatic charset conversion.
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r-- | sql/repl_failsafe.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 7891ff92236..413ccb7fde2 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -440,7 +440,7 @@ int show_new_master(THD* thd) if (protocol->send_fields(&field_list, 1)) DBUG_RETURN(-1); protocol->prepare_for_resend(); - protocol->store(lex_mi->log_file_name, system_charset_info); + protocol->store(lex_mi->log_file_name, &my_charset_bin); protocol->store((ulonglong) lex_mi->pos); if (protocol->write()) DBUG_RETURN(-1); @@ -610,11 +610,11 @@ int show_slave_hosts(THD* thd) SLAVE_INFO* si = (SLAVE_INFO*) hash_element(&slave_list, i); protocol->prepare_for_resend(); protocol->store((uint32) si->server_id); - protocol->store(si->host, system_charset_info); + protocol->store(si->host, &my_charset_bin); if (opt_show_slave_auth_info) { - protocol->store(si->user, system_charset_info); - protocol->store(si->password, system_charset_info); + protocol->store(si->user, &my_charset_bin); + protocol->store(si->password, &my_charset_bin); } protocol->store((uint32) si->port); protocol->store((uint32) si->rpl_recovery_rank); |