diff options
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rwxr-xr-x | vio/test-ssl | bin | 0 -> 42096 bytes |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 18de8c19c89..ff78ff678ab 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2605,9 +2605,11 @@ static struct option long_options[] = { {"master-port", required_argument, 0, (int) OPT_MASTER_PORT}, {"master-connect-retry", required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY}, {"master-info-file", required_argument, 0, (int) OPT_MASTER_INFO_FILE}, +#ifdef HAVE_SSL {"master-ssl", optional_argument, 0, (int) OPT_MASTER_SSL}, {"master-ssl-key", optional_argument, 0, (int) OPT_MASTER_SSL_KEY}, {"master-ssl-cert", optional_argument, 0, (int) OPT_MASTER_SSL_CERT}, +#endif {"myisam-recover", optional_argument, 0, (int) OPT_MYISAM_RECOVER}, {"memlock", no_argument, 0, (int) OPT_MEMLOCK}, // needs to be available for the test case to pass in non-debugging mode diff --git a/vio/test-ssl b/vio/test-ssl Binary files differnew file mode 100755 index 00000000000..fefa3fce263 --- /dev/null +++ b/vio/test-ssl |