diff options
| author | guilhem@mysql.com <> | 2003-04-03 20:19:14 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-04-03 20:19:14 +0200 |
| commit | f33c6e7c83d48945c9f40cdb795edff7b97605e3 (patch) | |
| tree | 1e7d763c7a8b742608cb0366d3f55b8deab53335 /sql/mysqld.cc | |
| parent | 8611c34e5e08a5c92e84deaf86b74e5af448f7d0 (diff) | |
| download | mariadb-git-f33c6e7c83d48945c9f40cdb795edff7b97605e3.tar.gz | |
More honest --master-ssl* options description. As these do nothing
yet, better say it and see no traffic on bugs@ and support@.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bc5334ce674..6d86346455a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3379,23 +3379,27 @@ struct my_option my_long_options[] = (gptr*) &master_info_file, (gptr*) &master_info_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"master-ssl", OPT_MASTER_SSL, - "Turn SSL on for replication. Be warned that is this is a relatively new feature.", + "Planned to enable the slave to connect to the master using SSL. Does nothing yet.", (gptr*) &master_ssl, (gptr*) &master_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"master-ssl-key", OPT_MASTER_SSL_KEY, - "Master SSL keyfile name. Only applies if you have enabled master-ssl.", + "Master SSL keyfile name. Only applies if you have enabled master-ssl. Does \ +nothing yet.", (gptr*) &master_ssl_key, (gptr*) &master_ssl_key, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"master-ssl-cert", OPT_MASTER_SSL_CERT, - "Master SSL certificate file name. Only applies if you have enabled master-ssl.", + "Master SSL certificate file name. Only applies if you have enabled \ +master-ssl. Does nothing yet.", (gptr*) &master_ssl_cert, (gptr*) &master_ssl_cert, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"master-ssl-capath", OPT_MASTER_SSL_CAPATH, - "Master SSL CA path. Only applies if you have enabled master-ssl.", + "Master SSL CA path. Only applies if you have enabled master-ssl. \ +Does nothing yet.", (gptr*) &master_ssl_capath, (gptr*) &master_ssl_capath, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"master-ssl-cipher", OPT_MASTER_SSL_CIPHER, - "Master SSL cipher. Only applies if you have enabled master-ssl.", + "Master SSL cipher. Only applies if you have enabled master-ssl. \ +Does nothing yet.", (gptr*) &master_ssl_cipher, (gptr*) &master_ssl_capath, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"myisam-recover", OPT_MYISAM_RECOVER, |