Author: jstephens
Date: 2011-01-28 16:27:11 +0100 (Fri, 28 Jan 2011)
New Revision: 24926
Log:
have_ssl can be YES, NO, or DISABLED (Thanks, AJ!)
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.0/dba-mysqld-server-core.xml
trunk/refman-5.1/dba-mysqld-server-core.xml
trunk/refman-5.5/dba-mysqld-server-core.xml
trunk/refman-5.6/dba-mysqld-server-core.xml
trunk/refman-6.0/dba-mysqld-server-core.xml
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 1; 838 bytes
@@ -26032,7 +26032,12 @@
<vartype isdynamic="no" class="system" scope="global"/>
</types>
- <values vartype="boolean" platform="all"/>
+ <values vartype="string" platform="all">
+ <choice value="YES">SSL support available</choice>
+ <choice value="NO">No SSL support was compiled into the server</choice>
+ <choice value="DISABLED">SSL support was compiled into the server, but the
+ server was not started with the necessary options to enable it</choice>
+ </values>
<versions>
<manual version="5.0"/>
Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 2; 1073 bytes
@@ -5196,8 +5196,16 @@
<para>
<literal>YES</literal> if <command>mysqld</command> supports
- SSL connections, <literal>NO</literal> if not. This variable
- was added in MySQL 5.0.38. Before that, use
+ SSL connections, <literal>NO</literal> if not.
+ <literal>DISABLED</literal> indicates that the server was
+ compiled with SSL support, but but was not started with the
+ appropriate
+ <option>--ssl-<replaceable>xxx</replaceable></option> options.
+ See <xref linkend="secure-using-ssl"/>, for more information.
+ </para>
+
+ <para>
+ This variable was added in MySQL 5.0.38. Before that, use
<literal role="sysvar">have_openssl</literal>.
</para>
</listitem>
Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 2; 1073 bytes
@@ -5894,8 +5894,16 @@
<para>
<literal>YES</literal> if <command>mysqld</command> supports
- SSL connections, <literal>NO</literal> if not. This variable
- was added in MySQL 5.1.17. Before that, use
+ SSL connections, <literal>NO</literal> if not.
+ <literal>DISABLED</literal> indicates that the server was
+ compiled with SSL support, but but was not started with the
+ appropriate
+ <option>--ssl-<replaceable>xxx</replaceable></option> options.
+ See <xref linkend="secure-using-ssl"/>, for more information.
+ </para>
+
+ <para>
+ This variable was added in MySQL 5.1.17. Before that, use
<literal role="sysvar">have_openssl</literal>.
</para>
</listitem>
Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 791 bytes
@@ -5812,6 +5812,11 @@
<para>
<literal>YES</literal> if <command>mysqld</command> supports
SSL connections, <literal>NO</literal> if not.
+ <literal>DISABLED</literal> indicates that the server was
+ compiled with SSL support, but but was not started with the
+ appropriate
+ <option>--ssl-<replaceable>xxx</replaceable></option> options.
+ See <xref linkend="secure-using-ssl"/>, for more information.
</para>
</listitem>
Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 791 bytes
@@ -5586,6 +5586,11 @@
<para>
<literal>YES</literal> if <command>mysqld</command> supports
SSL connections, <literal>NO</literal> if not.
+ <literal>DISABLED</literal> indicates that the server was
+ compiled with SSL support, but but was not started with the
+ appropriate
+ <option>--ssl-<replaceable>xxx</replaceable></option> options.
+ See <xref linkend="secure-using-ssl"/>, for more information.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml 2011-01-28 15:12:19 UTC (rev 24925)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml 2011-01-28 15:27:11 UTC (rev 24926)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 791 bytes
@@ -6032,6 +6032,11 @@
<para>
<literal>YES</literal> if <command>mysqld</command> supports
SSL connections, <literal>NO</literal> if not.
+ <literal>DISABLED</literal> indicates that the server was
+ compiled with SSL support, but but was not started with the
+ appropriate
+ <option>--ssl-<replaceable>xxx</replaceable></option> options.
+ See <xref linkend="secure-using-ssl"/>, for more information.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24926 - in trunk: dynamic-docs/command-optvars refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | jon.stephens | 28 Jan |
