Author: paul
Date: 2008-07-25 21:43:01 +0200 (Fri, 25 Jul 2008)
New Revision: 11387
Log:
r33003@frost: paul | 2008-07-25 14:43:09 -0500
Huh. We forgot to say what DEFAULT means for the Support column of SHOW
ENGINES output.
Modified:
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33000
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32506
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33003
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32506
Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2008-07-25 18:00:33 UTC (rev
11386)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2008-07-25 19:43:01 UTC (rev
11387)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 6; 2345 bytes
@@ -4709,7 +4709,7 @@
The output from <literal>SHOW ENGINES</literal> may vary
according to the MySQL version used and other factors. The
values shown in the <literal>Support</literal> column indicate
- the server's level of support for different features, as shown
+ the server's level of support for the storage engine, as shown
here:
</para>
@@ -4724,15 +4724,19 @@
</row>
<row>
<entry><literal>YES</literal></entry>
- <entry>The feature is supported and is active.</entry>
+ <entry>The engine is supported and is active</entry>
</row>
<row>
+ <entry><literal>DEFAULT</literal></entry>
+ <entry>Like <literal>YES</literal>, plus this is the
default engine</entry>
+ </row>
+ <row>
<entry><literal>NO</literal></entry>
- <entry>The feature is not supported.</entry>
+ <entry>The engine is not supported</entry>
</row>
<row>
<entry><literal>DISABLED</literal></entry>
- <entry>The feature is supported but has been disabled.</entry>
+ <entry>The engine is supported but has been disabled</entry>
</row>
</tbody>
</tgroup>
@@ -4740,13 +4744,13 @@
<para>
A value of <literal>NO</literal> means that the server was
- compiled without support for the feature, so it cannot be
+ compiled without support for the engine, so it cannot be
activated at runtime.
</para>
<para>
A value of <literal>DISABLED</literal> occurs either because the
- server was started with an option that disables the feature, or
+ server was started with an option that disables the engine, or
because not all options required to enable it were given. In the
latter case, the error log file should contain a reason
indicating why the option is disabled. See
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2008-07-25 18:00:33 UTC (rev
11386)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2008-07-25 19:43:01 UTC (rev
11387)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 6; 2345 bytes
@@ -5413,7 +5413,7 @@
The output from <literal>SHOW ENGINES</literal> may vary
according to the MySQL version used and other factors. The
values shown in the <literal>Support</literal> column indicate
- the server's level of support for different features, as shown
+ the server's level of support for the storage engine, as shown
here:
</para>
@@ -5428,15 +5428,19 @@
</row>
<row>
<entry><literal>YES</literal></entry>
- <entry>The feature is supported and is active.</entry>
+ <entry>The engine is supported and is active</entry>
</row>
<row>
+ <entry><literal>DEFAULT</literal></entry>
+ <entry>Like <literal>YES</literal>, plus this is the
default engine</entry>
+ </row>
+ <row>
<entry><literal>NO</literal></entry>
- <entry>The feature is not supported.</entry>
+ <entry>The engine is not supported</entry>
</row>
<row>
<entry><literal>DISABLED</literal></entry>
- <entry>The feature is supported but has been disabled.</entry>
+ <entry>The engine is supported but has been disabled</entry>
</row>
</tbody>
</tgroup>
@@ -5444,13 +5448,13 @@
<para>
A value of <literal>NO</literal> means that the server was
- compiled without support for the feature, so it cannot be
+ compiled without support for the engine, so it cannot be
activated at runtime.
</para>
<para>
A value of <literal>DISABLED</literal> occurs either because the
- server was started with an option that disables the feature, or
+ server was started with an option that disables the engine, or
because not all options required to enable it were given. In the
latter case, the error log file should contain a reason
indicating why the option is disabled. See
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2008-07-25 18:00:33 UTC (rev
11386)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2008-07-25 19:43:01 UTC (rev
11387)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 6; 2345 bytes
@@ -5430,7 +5430,7 @@
The output from <literal>SHOW ENGINES</literal> may vary
according to the MySQL version used and other factors. The
values shown in the <literal>Support</literal> column indicate
- the server's level of support for different features, as shown
+ the server's level of support for the storage engine, as shown
here:
</para>
@@ -5445,15 +5445,19 @@
</row>
<row>
<entry><literal>YES</literal></entry>
- <entry>The feature is supported and is active.</entry>
+ <entry>The engine is supported and is active</entry>
</row>
<row>
+ <entry><literal>DEFAULT</literal></entry>
+ <entry>Like <literal>YES</literal>, plus this is the
default engine</entry>
+ </row>
+ <row>
<entry><literal>NO</literal></entry>
- <entry>The feature is not supported.</entry>
+ <entry>The engine is not supported</entry>
</row>
<row>
<entry><literal>DISABLED</literal></entry>
- <entry>The feature is supported but has been disabled.</entry>
+ <entry>The engine is supported but has been disabled</entry>
</row>
</tbody>
</tgroup>
@@ -5461,13 +5465,13 @@
<para>
A value of <literal>NO</literal> means that the server was
- compiled without support for the feature, so it cannot be
+ compiled without support for the engine, so it cannot be
activated at runtime.
</para>
<para>
A value of <literal>DISABLED</literal> occurs either because the
- server was started with an option that disables the feature, or
+ server was started with an option that disables the engine, or
because not all options required to enable it were given. In the
latter case, the error log file should contain a reason
indicating why the option is disabled. See
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11387 - in trunk: . refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 25 Jul |