summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <Dao-Gang.Qu@sun.com>2009-12-11 09:57:38 +0800
committerunknown <Dao-Gang.Qu@sun.com>2009-12-11 09:57:38 +0800
commit18d09c0183c022ee19eebb71b8278ef2c5219514 (patch)
tree7710c603491904ac2732f8994f7b20d451c9de4d /sql/mysqld.cc
parentbd308d1256fa7af7128c24f4a5e2abfb8274437a (diff)
downloadmariadb-git-18d09c0183c022ee19eebb71b8278ef2c5219514.tar.gz
Bug #48742 Replication: incorrect help text for --init-slave
The help text for --init-slave=name: "Command(s) that are executed when a slave connects to this master". This text indicate that the --init-slave option is set on a master server, and the master server passes the option's argument to slave which connects to it. This is wrong. Actually the --init-slave option just can be set on a slave server, and then the slave server executes the argument each time the SQL thread starts. Correct the help text for --init-slave option as following: "Command(s) that are executed by a slave server each time the SQL thread starts." sql/mysqld.cc: Correct the help text for --init-slave option.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ce1d562d0ca..b4eb96ab65a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5275,7 +5275,8 @@ Disable with --skip-large-pages.",
#endif
{"init-rpl-role", OPT_INIT_RPL_ROLE, "Set the replication role.", 0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
- {"init-slave", OPT_INIT_SLAVE, "Command(s) that are executed when a slave connects to this master",
+ {"init-slave", OPT_INIT_SLAVE, "Command(s) that are executed by a slave server \
+each time the SQL thread starts.",
(gptr*) &opt_init_slave, (gptr*) &opt_init_slave, 0, GET_STR_ALLOC,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"innodb", OPT_INNODB, "Enable InnoDB (if this version of MySQL supports it). \