Skip to content

M
mariadb
Commit 28056ba2 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

don't show --ssl* option if ssl is not compiled in

parent 50f9dc6a
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 43 deletions
Makefile.am
View file @ 28056ba2
......@@ -129,14 +129,14 @@ smoke:
test-full: test test-nr test-ps
test-force:
$(MAKE) force=--force test
$(MAKE) -k force=--force test
test-force-full:
$(MAKE) force=--force test-full
$(MAKE) -k force=--force test-full
#used by autopush.pl to run memory based tests
test-force-mem:
$(MAKE) force=--force mem=--mem test
$(MAKE) -k force=--force mem=--mem test
EXP = --experimental=collections/default.experimental
......
mysql-test/include/mysqld--help.inc
View file @ 28056ba2
......@@ -12,7 +12,7 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help
perl;
@skipvars=qw/basedir open-files-limit general-log-file log
log-slow-queries pid-file slow-query-log-file/;
@plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool
@plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool ssl des-key-file
thread-concurrency super-large-pages mutex-deadlock-detector/;
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/;
$re1=join('|', @skipvars, @plugins);
......
mysql-test/r/mysqld--help-notwin.result
View file @ 28056ba2
......@@ -124,8 +124,6 @@ The following options may be given as the first argument:
handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is
room in the queue again
--des-key-file=name Load keys for des_encrypt() and des_encrypt from given
file.
--disconnect-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
......@@ -646,13 +644,6 @@ The following options may be given as the first argument:
anymore.
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
for the complete list of valid sql modes
--ssl Enable SSL for connection (automatically enabled with
other flags).
--ssl-ca=name CA file in PEM format (check OpenSSL docs, implies --ssl)
--ssl-capath=name CA directory (check OpenSSL docs, implies --ssl)
--ssl-cert=name X509 cert in PEM format (implies --ssl)
--ssl-cipher=name SSL cipher to use (implies --ssl)
--ssl-key=name X509 key in PEM format (implies --ssl)
-s, --symbolic-links
Enable symbolic link support.
--sync-binlog=# Synchronously flush binary log to disk after every #th
......@@ -763,7 +754,6 @@ delay-key-write ON
delayed-insert-limit 100
delayed-insert-timeout 300
delayed-queue-size 1000
des-key-file (No default value)
disconnect-slave-event-count 0
div-precision-increment 4
enable-locking FALSE
......@@ -916,12 +906,6 @@ socket /tmp/mysql.sock
sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE
sql-mode
ssl FALSE
ssl-ca (No default value)
ssl-capath (No default value)
ssl-cert (No default value)
ssl-cipher (No default value)
ssl-key (No default value)
symbolic-links FALSE
sync-binlog 0
sync-frm TRUE
......
mysql-test/r/mysqld--help-win.result
View file @ 28056ba2
......@@ -124,8 +124,6 @@ The following options may be given as the first argument:
handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is
room in the queue again
--des-key-file=name Load keys for des_encrypt() and des_encrypt from given
file.
--disconnect-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
......@@ -649,13 +647,6 @@ The following options may be given as the first argument:
anymore.
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
for the complete list of valid sql modes
--ssl Enable SSL for connection (automatically enabled with
other flags).
--ssl-ca=name CA file in PEM format (check OpenSSL docs, implies --ssl)
--ssl-capath=name CA directory (check OpenSSL docs, implies --ssl)
--ssl-cert=name X509 cert in PEM format (implies --ssl)
--ssl-cipher=name SSL cipher to use (implies --ssl)
--ssl-key=name X509 key in PEM format (implies --ssl)
--standalone Dummy option to start as a standalone program (NT).
-s, --symbolic-links
Enable symbolic link support.
......@@ -767,7 +758,6 @@ delay-key-write ON
delayed-insert-limit 100
delayed-insert-timeout 300
delayed-queue-size 1000
des-key-file (No default value)
disconnect-slave-event-count 0
div-precision-increment 4
enable-locking FALSE
......@@ -922,12 +912,6 @@ socket MySQL
sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE
sql-mode
ssl FALSE
ssl-ca (No default value)
ssl-capath (No default value)
ssl-cert (No default value)
ssl-cipher (No default value)
ssl-key (No default value)
symbolic-links FALSE
sync-binlog 0
sync-frm TRUE
......
sql/mysqld.cc
View file @ 28056ba2
......@@ -5743,10 +5743,12 @@ Can't be set to 1 if --log-slave-updates is used.",
"The update log is deprecated since version 5.0, is replaced by the "
"binary log and this option does nothing anymore.",
0, 0, 0, GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_OPENSSL
{"ssl", 0,
"Enable SSL for connection (automatically enabled with other flags).",
(uchar **) &opt_use_ssl, (uchar **) &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, 0, 0,
0, 0, 0},
#endif
#ifdef __WIN__
{"standalone", 0,
"Dummy option to start as a standalone program (NT).", 0, 0, 0, GET_NO_ARG,
......
sql/sys_vars.cc
View file @ 28056ba2
......@@ -1654,31 +1654,37 @@ static Sys_var_set Sys_sql_mode(
sql_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(check_sql_mode), ON_UPDATE(fix_sql_mode));
#ifdef HAVE_OPENSSL
#define SSL_OPT(X) CMD_LINE(REQUIRED_ARG,X)
#else
#define SSL_OPT(X) NO_CMD_LINE
#endif
static Sys_var_charptr Sys_ssl_ca(
"ssl_ca",
"CA file in PEM format (check OpenSSL docs, implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_ca), CMD_LINE(REQUIRED_ARG, OPT_SSL_CA),
READ_ONLY GLOBAL_VAR(opt_ssl_ca), SSL_OPT(OPT_SSL_CA),
IN_FS_CHARSET, DEFAULT(0));
static Sys_var_charptr Sys_ssl_capath(
"ssl_capath",
"CA directory (check OpenSSL docs, implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_capath),
CMD_LINE(REQUIRED_ARG, OPT_SSL_CAPATH), IN_FS_CHARSET, DEFAULT(0));
READ_ONLY GLOBAL_VAR(opt_ssl_capath), SSL_OPT(OPT_SSL_CAPATH),
IN_FS_CHARSET, DEFAULT(0));
static Sys_var_charptr Sys_ssl_cert(
"ssl_cert", "X509 cert in PEM format (implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_cert), CMD_LINE(REQUIRED_ARG, OPT_SSL_CERT),
READ_ONLY GLOBAL_VAR(opt_ssl_cert), SSL_OPT(OPT_SSL_CERT),
IN_FS_CHARSET, DEFAULT(0));
static Sys_var_charptr Sys_ssl_cipher(
"ssl_cipher", "SSL cipher to use (implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_cipher),
CMD_LINE(REQUIRED_ARG, OPT_SSL_CIPHER), IN_FS_CHARSET, DEFAULT(0));
READ_ONLY GLOBAL_VAR(opt_ssl_cipher), SSL_OPT(OPT_SSL_CIPHER),
IN_FS_CHARSET, DEFAULT(0));
static Sys_var_charptr Sys_ssl_key(
"ssl_key", "X509 key in PEM format (implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_key), CMD_LINE(REQUIRED_ARG, OPT_SSL_KEY),
READ_ONLY GLOBAL_VAR(opt_ssl_key), SSL_OPT(OPT_SSL_KEY),
IN_FS_CHARSET, DEFAULT(0));
// why ENUM and not BOOL ?
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7