diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-12-11 16:07:09 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-12-11 16:07:09 +0200 |
| commit | a72c4259c846f57b37b7f0010efd6bb0a00213b4 (patch) | |
| tree | 37329446725f5c6b6bced24107c9228c59274493 /sql | |
| parent | 30e51fe8540026f00c2c599098257c1e33c9b94f (diff) | |
| parent | 18d09c0183c022ee19eebb71b8278ef2c5219514 (diff) | |
| download | mariadb-git-a72c4259c846f57b37b7f0010efd6bb0a00213b4.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 |
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). \ |