diff options
| author | Sergei Golubchik <serg@mysql.com> | 2009-12-25 22:36:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2009-12-25 22:36:59 +0100 |
| commit | 28056ba204d4023084ea5aa32fe6a8437cca00d6 (patch) | |
| tree | dc7fff302d73ac7f2253ffe266e83c3d5b143442 /mysql-test/r/mysqld--help-notwin.result | |
| parent | 50f9dc6a1d1adbd15ecef0584f9601c2f9b27742 (diff) | |
| download | mariadb-git-28056ba204d4023084ea5aa32fe6a8437cca00d6.tar.gz | |
don't show --ssl* option if ssl is not compiled in
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-notwin.result | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index 85c0ea7bd6c..2ba7df6b7e3 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.result @@ -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 |