diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-01 21:15:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-01 21:15:15 -0600 |
| commit | 2cf8889f57883e7732b66661117f15605315ddda (patch) | |
| tree | 9ba066c59c8efe0b639b3b3003be8c3047bd5981 /sql/sql_repl.cc | |
| parent | 6b5d02ac5326efdb9248881c2dde6a500c2f194a (diff) | |
| download | mariadb-git-2cf8889f57883e7732b66661117f15605315ddda.tar.gz | |
do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()
mysql-test/r/rpl000002.result:
new output of show slave hosts
sql/mysqld.cc:
user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
cleanup of register_slave_on_master()
sql/sql_repl.cc:
do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
show-slave-auth-info
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 7155ca4f0b7..714a9e10db7 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -830,8 +830,11 @@ int show_slave_hosts(THD* thd) List<Item> field_list; field_list.push_back(new Item_empty_string("Server_id", 20)); field_list.push_back(new Item_empty_string("Host", 20)); - field_list.push_back(new Item_empty_string("User",20)); - field_list.push_back(new Item_empty_string("Password",20)); + if(opt_show_slave_auth_info) + { + field_list.push_back(new Item_empty_string("User",20)); + field_list.push_back(new Item_empty_string("Password",20)); + } field_list.push_back(new Item_empty_string("Port",20)); if(send_fields(thd, field_list, 1)) @@ -848,8 +851,11 @@ int show_slave_hosts(THD* thd) packet->length(0); net_store_data(packet, si->server_id); net_store_data(packet, si->host); - net_store_data(packet, si->user); - net_store_data(packet, si->password); + if(opt_show_slave_auth_info) + { + net_store_data(packet, si->user); + net_store_data(packet, si->password); + } net_store_data(packet, (uint)si->port); if(my_net_write(net, (char*)packet->ptr(), packet->length())) { |