diff options
| author | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
| commit | 719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7 (patch) | |
| tree | 7c33cbe46adf4c8f526f3f2de68fb9c3701071d3 /include/sslopt-longopts.h | |
| parent | 8dff422f0bf901c0d8cc8f975df635df0fe03762 (diff) | |
| parent | c06972bf2a9e9739c0eb926c6f750b8990fd4c17 (diff) | |
| download | mariadb-git-719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
include/sslopt-longopts.h:
Resolve conflict
include/sslopt-vars.h:
Resolve conflict
mysql-test/r/variables.result:
Resolve conflict
mysql-test/t/variables.test:
Resolve conflict
Diffstat (limited to 'include/sslopt-longopts.h')
| -rw-r--r-- | include/sslopt-longopts.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h index b0769af10fe..0435ddb815a 100644 --- a/include/sslopt-longopts.h +++ b/include/sslopt-longopts.h @@ -20,12 +20,6 @@ "Enable SSL for connection (automatically enabled with other flags). Disable with --skip-ssl.", (gptr*) &opt_use_ssl, (gptr*) &opt_use_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).", - (gptr*) &opt_ssl_key, (gptr*) &opt_ssl_key, 0, GET_STR, REQUIRED_ARG, - 0, 0, 0, 0, 0, 0}, - {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).", - (gptr*) &opt_ssl_cert, (gptr*) &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG, - 0, 0, 0, 0, 0, 0}, {"ssl-ca", OPT_SSL_CA, "CA file in PEM format (check OpenSSL docs, implies --ssl).", (gptr*) &opt_ssl_ca, (gptr*) &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG, @@ -34,9 +28,15 @@ "CA directory (check OpenSSL docs, implies --ssl).", (gptr*) &opt_ssl_capath, (gptr*) &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).", + (gptr*) &opt_ssl_cert, (gptr*) &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, {"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl).", (gptr*) &opt_ssl_cipher, (gptr*) &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).", + (gptr*) &opt_ssl_key, (gptr*) &opt_ssl_key, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, #ifdef MYSQL_CLIENT {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT, "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.", |