Commit 40dba5a8 authored by unknown's avatar unknown

useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),

just for beauty of truth.


sql/mysqld.cc:
  correcting sentence (even if option is not really usable,
  as it depends on report-user and report-password which are undocumented
  (and will stay like this)).
sql/slave.cc:
  report password when you must report password.
parent a1ec6140
...@@ -3674,7 +3674,7 @@ relay logs", ...@@ -3674,7 +3674,7 @@ relay logs",
"Change the value of a variable. Please note that this option is deprecated;you can set variables directly with --variable-name=value.", "Change the value of a variable. Please note that this option is deprecated;you can set variables directly with --variable-name=value.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"show-slave-auth-info", OPT_SHOW_SLAVE_AUTH_INFO, {"show-slave-auth-info", OPT_SHOW_SLAVE_AUTH_INFO,
"Show user and password in SHOW SLAVE STATUS", "Show user and password in SHOW SLAVE HOSTS on this master",
(gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0, (gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"concurrent-insert", OPT_CONCURRENT_INSERT, {"concurrent-insert", OPT_CONCURRENT_INSERT,
......
...@@ -1776,7 +1776,7 @@ int register_slave_on_master(MYSQL* mysql) ...@@ -1776,7 +1776,7 @@ int register_slave_on_master(MYSQL* mysql)
packet.append((char)0); packet.append((char)0);
if (report_password) if (report_password)
net_store_data(&packet, report_user); net_store_data(&packet, report_password);
else else
packet.append((char)0); packet.append((char)0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment