List:Commits« Previous MessageNext Message »
From:paul Date:January 22 2006 4:13am
Subject:svn commit - mysqldoc@docsrva: r979 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-22 05:13:11 +0100 (Sun, 22 Jan 2006)
New Revision: 979

Log:
 r6543@frost:  paul | 2006-01-21 21:43:23 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6541
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6543
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-22 00:25:47 UTC (rev 978)
+++ trunk/refman-4.1/database-administration.xml	2006-01-22 04:13:11 UTC (rev 979)
@@ -799,17 +799,23 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--external-locking</option>
             </para>
 
-            <remark role="todo">
-              Version info for this option? [js]
-            </remark>
-
             <para>
-              Enable system locking. Note that if you use this option on
-              a system on which <literal>lockd</literal> does not fully
-              work (as on Linux), it is easy for
+              Enable external locking (system locking), which is
+              disabled by default as of MySQL 4.0. Note that if you use
+              this option on a system on which <literal>lockd</literal>
+              does not fully work (such as Linux), it is easy for
               <command>mysqld</command> to deadlock. This option
               previously was named <option>--enable-locking</option>.
             </para>
@@ -817,8 +823,8 @@
             <para>
               <emphasis role="bold">Note</emphasis>: If you use this
               option to enable updates to <literal>MyISAM</literal>
-              tables from many MySQL processes, you have to ensure that
-              these conditions are satisfied:
+              tables from many MySQL processes, you must ensure that the
+              following conditions are satisfied:
             </para>
 
             <itemizedlist>
@@ -1483,24 +1489,35 @@
           </listitem>
 
           <listitem>
-            <remark role="todo">
-              Version info? [js]
-            </remark>
+            <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
 
-            <para>
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--skip-external-locking</option>
             </para>
 
             <para>
-              do not use system locking. To use
-              <command>isamchk</command> or
-              <command>myisamchk</command>, you must shut down the
-              server. See <xref linkend="stability"/>. In MySQL 3.23,
-              you can use <literal>CHECK TABLE</literal> and
-              <literal>REPAIR TABLE</literal> to check and repair
+              Do not use external locking (system locking). With
+              external locking enabled, you must shut down the server to
+              use <command>myisamchk</command> or
+              <command>isamchk</command>. See
+              <xref linkend="stability"/>. As of MySQL 3.23, you can use
+              the <literal>CHECK TABLE</literal> and <literal>REPAIR
+              TABLE</literal> statements to check and repair
               <literal>MyISAM</literal> tables. This option previously
               was named <option>--skip-locking</option>.
             </para>
+
+            <para>
+              External locking has been disabled by default since MySQL
+              4.0.
+            </para>
           </listitem>
 
           <listitem>
@@ -7821,8 +7838,8 @@
           <literal>InnoDB</literal> support, but this option actually is
           needed only for MySQL 3.23. From MySQL 4.0 onward,
           <literal>InnoDB</literal> is included by default in all binary
-          distributions, so you do not need a MySQL-Max server merely to
-          obtain <literal>InnoDB</literal> support.
+          distributions, so a MySQL-Max server is not needed to obtain
+          <literal>InnoDB</literal> support.
         </para>
       </listitem>
 
@@ -7993,45 +8010,37 @@
     </informaltable>
 
     <remark>
-      Output for both SHOW commands following is from 4.1.13a-nt-max
+      Output for both SHOW commands following is from 4.1.18-log
     </remark>
 
     <para>
-      To find out which storage engines your server supports, issue the
-      following statement:
+      To find out which storage engines your server supports, use the
+      <literal>SHOW ENGINES</literal> statement. (See
+      <xref linkend="show-engines"/>.) For example:
     </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW ENGINES;</userinput>
-+------------+---------+------------------------------------------------------------+
-| Engine     | Support | Comment                                                    |
-+------------+---------+------------------------------------------------------------+
-| MyISAM     | DEFAULT | Default engine as of MySQL 3.23 with great performance     |
-| HEAP       | YES     | Alias for MEMORY                                           |
-| MEMORY     | YES     | Hash based, stored in memory, useful for temporary tables  |
-| MERGE      | YES     | Collection of identical MyISAM tables                      |
-| MRG_MYISAM | YES     | Alias for MERGE                                            |
-| ISAM       | NO      | Obsolete storage engine, now replaced by MyISAM            |
-| MRG_ISAM   | NO      | Obsolete storage engine, now replaced by MERGE             |
-| InnoDB     | YES     | Supports transactions, row-level locking, and foreign keys |
-| INNOBASE   | YES     | Alias for INNODB                                           |
-| BDB        | YES     | Supports transactions and page-level locking               |
-| BERKELEYDB | YES     | Alias for BDB                                              |
-| NDBCLUSTER | NO      | Clustered, fault-tolerant, memory-based tables             |
-| NDB        | NO      | Alias for NDBCLUSTER                                       |
-| EXAMPLE    | NO      | Example storage engine                                     |
-| ARCHIVE    | NO      | Archive storage engine                                     |
-| CSV        | NO      | CSV storage engine                                         |
-| BLACKHOLE  | NO      | Storage engine designed to act as null storage             |
-+------------+---------+------------------------------------------------------------+
-17 rows in set (0.02 sec)
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+ Engine: MyISAM
+Support: DEFAULT
+Comment: Default engine as of MySQL 3.23 with great performance
+*************************** 2. row ***************************
+ Engine: HEAP
+Support: YES
+Comment: Alias for MEMORY
+*************************** 3. row ***************************
+ Engine: MEMORY
+Support: YES
+Comment: Hash based, stored in memory, useful for temporary tables
+*************************** 4. row ***************************
+ Engine: MERGE
+Support: YES
+Comment: Collection of identical MyISAM tables
+...
 </programlisting>
 
     <para>
-      (See also <xref linkend="show-engines"/>.)
-    </para>
-
-    <para>
       Before MySQL 4.1.2, <literal>SHOW ENGINES</literal> is
       unavailable. Use the following statement instead and check the
       value of the variable for the storage engine in which you are
@@ -8043,18 +8052,18 @@
 +-----------------------+-------+
 | Variable_name         | Value |
 +-----------------------+-------+
-| have_archive          | NO    |
+| have_archive          | YES   |
 | have_bdb              | YES   |
-| have_blackhole_engine | NO    |
+| have_blackhole_engine | YES   |
 | have_compress         | YES   |
-| have_crypt            | NO    |
-| have_csv              | NO    |
-| have_example_engine   | NO    |
+| have_crypt            | YES   |
+| have_csv              | YES   |
+| have_example_engine   | YES   |
 | have_geometry         | YES   |
 | have_innodb           | YES   |
 | have_isam             | NO    |
 | have_ndbcluster       | NO    |
-| have_openssl          | NO    |
+| have_openssl          | YES   |
 | have_query_cache      | YES   |
 | have_raid             | NO    |
 | have_rtree_keys       | YES   |
@@ -8064,10 +8073,10 @@
 </programlisting>
 
     <para>
-      The precise output from these <literal>SHOW</literal> commands
-      will vary according to the MySQL version used (and the features
-      which are enabled). The values in the second column indicate the
-      server's level of support for each feature, as shown here:
+      The precise output from these statements may vary according to the
+      MySQL version used (and the features that are enabled). The values
+      of the second column of the output indicate the server's level of
+      support for each feature, as shown here:
     </para>
 
     <informaltable>
@@ -8105,10 +8114,8 @@
       A value of <literal>DISABLED</literal> occurs either because the
       server was started with an option that disables the feature, or
       because not all options required to enable it were given. In the
-      latter case, the
-      <literal><replaceable>host_name</replaceable>.err</literal> error
-      log file should contain a reason indicating why the option is
-      disabled.
+      latter case, the error log file should contain a reason indicating
+      why the option is disabled. See <xref linkend="error-log"/>.
     </para>
 
     <para>
@@ -8125,14 +8132,14 @@
     </para>
 
     <para>
-      You might also see <literal>DISABLED</literal> for the
-      <literal>InnoDB</literal>, <literal>BDB</literal>, or
-      <literal>ISAM</literal> storage engines if the server was compiled
-      to support them, but was started with the
-      <option>--skip-innodb</option>, <option>--skip-bdb</option>, or
-      <option>--skip-isam</option> options at runtime. This is also the
-      case where the server supports <literal>NDB Cluster</literal>, but
-      was not started with the <option>ndbcluster</option> option.
+      You might also see <literal>DISABLED</literal> for a storage
+      engine if the server was compiled to support it, but was started
+      with a <option>--skip-<replaceable>engine</replaceable></option>
+      or. For example, <option>--skip-innodb</option> disalbes the
+      <literal>InnoDB</literal> engine. For the <literal>NDB
+      Cluster</literal> storage engine, <literal>DISABLED</literal>
+      means the server was compiled with support for MySQL Cluster, but
+      was not started with the <option>--ndb-cluster</option> option.
     </para>
 
     <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-22 00:25:47 UTC (rev 978)
+++ trunk/refman-5.0/database-administration.xml	2006-01-22 04:13:11 UTC (rev 979)
@@ -706,8 +706,8 @@
             </para>
 
             <para>
-              This option is a synonym for
-              <option>--default-table-type</option>.
+              Set the default storage engine (table type) for tables.
+              See <xref linkend="storage-engines"/>.
             </para>
           </listitem>
 
@@ -717,8 +717,8 @@
             </para>
 
             <para>
-              Set the default table type (storage engine) for tables.
-              See <xref linkend="storage-engines"/>.
+              This option is a synonym for
+              <option>--default-storage-engine</option>.
             </para>
           </listitem>
 
@@ -807,13 +807,23 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--external-locking</option>
             </para>
 
             <para>
-              Enable system locking. Note that if you use this option on
-              a system on which <literal>lockd</literal> does not fully
-              work (as on Linux), it is easy for
+              Enable external locking (system locking), which is
+              disabled by default as of MySQL 4.0. Note that if you use
+              this option on a system on which <literal>lockd</literal>
+              does not fully work (such as Linux), it is easy for
               <command>mysqld</command> to deadlock. This option
               previously was named <option>--enable-locking</option>.
             </para>
@@ -821,8 +831,8 @@
             <para>
               <emphasis role="bold">Note</emphasis>: If you use this
               option to enable updates to <literal>MyISAM</literal>
-              tables from many MySQL processes, you have to ensure that
-              these conditions are satisfied:
+              tables from many MySQL processes, you must ensure that the
+              following conditions are satisfied:
             </para>
 
             <itemizedlist>
@@ -1483,17 +1493,32 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--skip-external-locking</option>
             </para>
 
             <para>
-              Don't use system locking. To use
-              <command>myisamchk</command>, you must shut down the
-              server. (See <xref linkend="stability"/>.) To avoid this
-              requirement, use <literal>CHECK TABLE</literal> and
-              <literal>REPAIR TABLE</literal> from the MySQL Monitor to
-              check and repair <literal>MyISAM</literal> tables.
+              Do not use external locking (system locking). With
+              external locking enabled, you must shut down the server to
+              use <command>myisamchk</command>. (See
+              <xref linkend="stability"/>.) To avoid this requirement,
+              use the <literal>CHECK TABLE</literal> and <literal>REPAIR
+              TABLE</literal> statements to check and repair
+              <literal>MyISAM</literal> tables.
             </para>
+
+            <para>
+              External locking has been disabled by default since MySQL
+              4.0.
+            </para>
           </listitem>
 
           <listitem>
@@ -9010,6 +9035,10 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd] Fix this when the 5.1 policy gets ironed out.
+        </remark>
+
         <para>
           <option>--with-innodb</option>
         </para>
@@ -9019,8 +9048,8 @@
           storage engine. MySQL-Max servers always include
           <literal>InnoDB</literal> support. From MySQL 4.0 onward,
           <literal>InnoDB</literal> is included by default in all binary
-          distributions, so you do not need a MySQL-Max server merely to
-          obtain <literal>InnoDB</literal> support.
+          distributions, so a MySQL-Max server is not needed to obtain
+          <literal>InnoDB</literal> support.
         </para>
       </listitem>
 
@@ -9213,84 +9242,48 @@
     </informaltable>
 
     <remark>
-      Output for both SHOW commands following is from 5.0.7-alpha-nt-max
+      Output for SHOW statement following is from 5.0.19-log
     </remark>
 
     <para>
-      To find out which storage engines your server supports, issue the
-      following statement:
+      To find out which storage engines your server supports, use the
+      <literal>SHOW ENGINES</literal> statement. (See
+      <xref linkend="show-engines"/>.) For example:
     </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW ENGINES;</userinput>
-+------------+---------+----------------------------------------------------------------+
-| Engine     | Support | Comment                                                        |
-+------------+---------+----------------------------------------------------------------+
-| MyISAM     | DEFAULT | Default engine as of MySQL 3.23 with great performance         |
-| MEMORY     | YES     | Hash based, stored in memory, useful for temporary tables      |
-| HEAP       | YES     | Alias for MEMORY                                               |
-| MERGE      | YES     | Collection of identical MyISAM tables                          |
-| MRG_MYISAM | YES     | Alias for MERGE                                                |
-| ISAM       | NO      | Obsolete storage engine, now replaced by MyISAM                |
-| MRG_ISAM   | NO      | Obsolete storage engine, now replaced by MERGE                 |
-| InnoDB     | YES     | Supports transactions, row-level locking, and foreign keys     |
-| INNOBASE   | YES     | Alias for INNODB                                               |
-| BDB        | YES     | Supports transactions and page-level locking                   |
-| BERKELEYDB | YES     | Alias for BDB                                                  |
-| NDBCLUSTER | NO      | Clustered, fault-tolerant, memory-based tables                 |
-| NDB        | NO      | Alias for NDBCLUSTER                                           |
-| EXAMPLE    | NO      | Example storage engine                                         |
-| ARCHIVE    | YES     | Archive storage engine                                         |
-| CSV        | NO      | CSV storage engine                                             |
-| FEDERATED  | YES     | Federated MySQL storage engine                                 |
-| BLACKHOLE  | YES     | /dev/null storage engine (anything you write to it disappears) |
-+------------+---------+----------------------------------------------------------------+
-18 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+ Engine: MyISAM
+Support: DEFAULT
+Comment: Default engine as of MySQL 3.23 with great performance
+*************************** 2. row ***************************
+ Engine: MEMORY
+Support: YES
+Comment: Hash based, stored in memory, useful for temporary tables
+*************************** 3. row ***************************
+ Engine: InnoDB
+Support: YES
+Comment: Supports transactions, row-level locking, and foreign keys
+*************************** 4. row ***************************
+ Engine: BerkeleyDB
+Support: NO
+Comment: Supports transactions and page-level locking
+*************************** 5. row ***************************
+ Engine: BLACKHOLE
+Support: YES
+Comment: /dev/null storage engine (anything you write to it disappears)
+...
 </programlisting>
 
     <para>
-      (See also <xref linkend="show-engines"/>.)
+      The precise output from <literal>SHOW ENGINES</literal> may vary
+      according to the MySQL version used (and the features that are
+      enabled). The <literal>Support</literal> values in the output
+      indicate the server's level of support for each feature, as shown
+      here:
     </para>
 
-    <para>
-      You can also use the following statement instead of <literal>SHOW
-      ENGINES</literal>, and check the value of the variable for the
-      storage engine in which you are interested:
-    </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW VARIABLES LIKE 'have%';</userinput>
-+-----------------------+-------+
-| Variable_name         | Value |
-+-----------------------+-------+
-| have_archive          | YES   |
-| have_bdb              | YES   |
-| have_blackhole_engine | YES   |
-| have_compress         | YES   |
-| have_crypt            | NO    |
-| have_csv              | NO    |
-| have_example_engine   | NO    |
-| have_federated_engine | YES   |
-| have_geometry         | YES   |
-| have_innodb           | YES   |
-| have_isam             | NO    |
-| have_ndbcluster       | NO    |
-| have_openssl          | YES   |
-| have_query_cache      | YES   |
-| have_raid             | NO    |
-| have_rtree_keys       | YES   |
-| have_symlink          | YES   |
-+-----------------------+-------+
-17 rows in set (0.06 sec)
-</programlisting>
-
-    <para>
-      The precise output from these <literal>SHOW</literal> commands
-      will vary according to the MySQL version used (and the features
-      which are enabled). The values in the second column indicate the
-      server's level of support for each feature, as shown here:
-    </para>
-
     <informaltable>
       <tgroup cols="2">
         <colspec colwidth="15*"/>
@@ -9326,22 +9319,19 @@
       A value of <literal>DISABLED</literal> occurs either because the
       server was started with an option that disables the feature, or
       because not all options required to enable it were given. In the
-      latter case, the
-      <literal><replaceable>host_name</replaceable>.err</literal> error
-      log file should contain a reason indicating why the option is
-      disabled.
+      latter case, the error log file should contain a reason indicating
+      why the option is disabled. See <xref linkend="error-log"/>.
     </para>
 
     <para>
-      You might also see <literal>DISABLED</literal> for the
-      <literal>InnoDB</literal> or <literal>BDB</literal> storage
-      engines if the server was compiled to support them, but was
-      started with the <option>--skip-innodb</option> or
-      <option>--skip-bdb</option> options at runtime. For the
-      <literal>NDB Cluster</literal> storage engine,
-      <literal>DISABLED</literal> means the server was compiled with
-      support for MySQL Cluster, but was not started with the
-      <option>--ndb-cluster</option> option.
+      You might also see <literal>DISABLED</literal> for a storage
+      engine if the server was compiled to support it, but was started
+      with a <option>--skip-<replaceable>engine</replaceable></option>
+      or. For example, <option>--skip-innodb</option> disalbes the
+      <literal>InnoDB</literal> engine. For the <literal>NDB
+      Cluster</literal> storage engine, <literal>DISABLED</literal>
+      means the server was compiled with support for MySQL Cluster, but
+      was not started with the <option>--ndb-cluster</option> option.
     </para>
 
     <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-22 00:25:47 UTC (rev 978)
+++ trunk/refman-5.1/database-administration.xml	2006-01-22 04:13:11 UTC (rev 979)
@@ -730,8 +730,8 @@
             </para>
 
             <para>
-              This option is a synonym for
-              <option>--default-table-type</option>.
+              Set the default storage engine (table type) for tables.
+              See <xref linkend="storage-engines"/>.
             </para>
           </listitem>
 
@@ -741,8 +741,8 @@
             </para>
 
             <para>
-              Set the default table type (storage engine) for tables.
-              See <xref linkend="storage-engines"/>.
+              This option is a synonym for
+              <option>--default-storage-engine</option>.
             </para>
           </listitem>
 
@@ -842,13 +842,23 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--external-locking</option>
             </para>
 
             <para>
-              Enable system locking. Note that if you use this option on
-              a system on which <literal>lockd</literal> does not fully
-              work (as on Linux), it is easy for
+              Enable external locking (system locking), which is
+              disabled by default as of MySQL 4.0. Note that if you use
+              this option on a system on which <literal>lockd</literal>
+              does not fully work (such as Linux), it is easy for
               <command>mysqld</command> to deadlock. This option
               previously was named <option>--enable-locking</option>.
             </para>
@@ -856,8 +866,8 @@
             <para>
               <emphasis role="bold">Note</emphasis>: If you use this
               option to enable updates to <literal>MyISAM</literal>
-              tables from many MySQL processes, you have to ensure that
-              these conditions are satisfied:
+              tables from many MySQL processes, you must ensure that the
+              following conditions are satisfied:
             </para>
 
             <itemizedlist>
@@ -1478,17 +1488,32 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <option>--skip-external-locking</option>
             </para>
 
             <para>
-              Don't use system locking. To use
-              <command>myisamchk</command>, you must shut down the
-              server. (See <xref linkend="stability"/>.) To avoid this
-              requirement, use <literal>CHECK TABLE</literal> and
-              <literal>REPAIR TABLE</literal> from the MySQL Monitor to
-              check and repair <literal>MyISAM</literal> tables.
+              Do not use external locking (system locking). With
+              external locking enabled, you must shut down the server to
+              use <command>myisamchk</command>. (See
+              <xref linkend="stability"/>.) To avoid this requirement,
+              use the <literal>CHECK TABLE</literal> and <literal>REPAIR
+              TABLE</literal> statements to check and repair
+              <literal>MyISAM</literal> tables.
             </para>
+
+            <para>
+              External locking has been disabled by default since MySQL
+              4.0.
+            </para>
           </listitem>
 
           <listitem>
@@ -9055,6 +9080,10 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd] Fix this when the 5.1 policy gets ironed out.
+        </remark>
+
         <para>
           <option>--with-innodb</option>
         </para>
@@ -9064,8 +9093,8 @@
           storage engine. MySQL-Max servers always include
           <literal>InnoDB</literal> support. From MySQL 4.0 onward,
           <literal>InnoDB</literal> is included by default in all binary
-          distributions, so you do not need a MySQL-Max server merely to
-          obtain <literal>InnoDB</literal> support.
+          distributions, so a MySQL-Max server is not needed to obtain
+          <literal>InnoDB</literal> support.
         </para>
       </listitem>
 
@@ -9258,85 +9287,56 @@
     </informaltable>
 
     <remark>
-      Output for both SHOW commands following is from 5.1.2-alpha-log
+      Output for SHOW statement following is from 5.1.6-alpha-log
     </remark>
 
     <para>
-      To find out which storage engines your server supports, issue the
-      following statement:
+      To find out which storage engines your server supports, use the
+      <literal>SHOW ENGINES</literal> statement. (See
+      <xref linkend="show-engines"/>.) For example:
     </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW ENGINES;</userinput>
-+------------+---------+----------------------------------------------------------------+
-| Engine     | Support | Comment                                                        |
-+------------+---------+----------------------------------------------------------------+
-| MyISAM     | DEFAULT | Default engine as of MySQL 3.23 with great performance         |
-| MEMORY     | YES     | Hash based, stored in memory, useful for temporary tables      |
-| HEAP       | YES     | Alias for MEMORY                                               |
-| MERGE      | YES     | Collection of identical MyISAM tables                          |
-| MRG_MYISAM | YES     | Alias for MERGE                                                |
-| ISAM       | NO      | Obsolete storage engine, now replaced by MyISAM                |
-| MRG_ISAM   | NO      | Obsolete storage engine, now replaced by MERGE                 |
-| InnoDB     | YES     | Supports transactions, row-level locking, and foreign keys     |
-| INNOBASE   | YES     | Alias for INNODB                                               |
-| BDB        | YES     | Supports transactions and page-level locking                   |
-| BERKELEYDB | YES     | Alias for BDB                                                  |
-| NDBCLUSTER | NO      | Clustered, fault-tolerant, memory-based tables                 |
-| NDB        | NO      | Alias for NDBCLUSTER                                           |
-| EXAMPLE    | NO      | Example storage engine                                         |
-| ARCHIVE    | YES     | Archive storage engine                                         |
-| CSV        | NO      | CSV storage engine                                             |
-| FEDERATED  | YES     | Federated MySQL storage engine                                 |
-| BLACKHOLE  | YES     | /dev/null storage engine (anything you write to it disappears) |
-+------------+---------+----------------------------------------------------------------+
-18 rows in set (0.00 sec)
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+      Engine: MEMORY
+     Support: YES
+     Comment: Hash based, stored in memory, useful for temporary tables
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 2. row ***************************
+      Engine: CSV
+     Support: YES
+     Comment: CSV storage engine
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 3. row ***************************
+      Engine: MRG_MYISAM
+     Support: YES
+     Comment: Collection of identical MyISAM tables
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 4. row ***************************
+      Engine: MyISAM
+     Support: DEFAULT
+     Comment: Default engine as of MySQL 3.23 with great performance
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+...
 </programlisting>
 
     <para>
-      (See also <xref linkend="show-engines"/>.)
+      The precise output from <literal>SHOW ENGINES</literal> may vary
+      according to the MySQL version used (and the features that are
+      enabled). The <literal>Support</literal> values in the output
+      indicate the server's level of support for each feature, as shown
+      here:
     </para>
 
-    <para>
-      You can also use the following statement instead of <literal>SHOW
-      ENGINES</literal>, and check the value of the variable for the
-      storage engine in which you are interested:
-    </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW VARIABLES LIKE 'have%';</userinput>
-+-----------------------+----------+
-| Variable_name         | Value    |
-+-----------------------+----------+
-| have_archive          | YES      |
-| have_bdb              | NO       |
-| have_blackhole_engine | YES      |
-| have_compress         | YES      |
-| have_crypt            | YES      |
-| have_csv              | YES      |
-| have_example_engine   | NO       |
-| have_federated_engine | NO       |
-| have_geometry         | YES      |
-| have_innodb           | YES      |
-| have_isam             | NO       |
-| have_ndbcluster       | DISABLED |
-| have_openssl          | NO       |
-| have_partition_engine | YES      |
-| have_query_cache      | YES      |
-| have_raid             | NO       |
-| have_rtree_keys       | YES      |
-| have_symlink          | YES      |
-+-----------------------+----------+
-18 rows in set (0.01 sec)
-</programlisting>
-
-    <para>
-      The precise output from these <literal>SHOW</literal> commands
-      will vary according to the MySQL version used (and the features
-      which are enabled). The values in the second column indicate the
-      server's level of support for each feature, as shown here:
-    </para>
-
     <informaltable>
       <tgroup cols="2">
         <colspec colwidth="15*"/>
@@ -9372,22 +9372,19 @@
       A value of <literal>DISABLED</literal> occurs either because the
       server was started with an option that disables the feature, or
       because not all options required to enable it were given. In the
-      latter case, the
-      <literal><replaceable>host_name</replaceable>.err</literal> error
-      log file should contain a reason indicating why the option is
-      disabled.
+      latter case, the error log file should contain a reason indicating
+      why the option is disabled. See <xref linkend="error-log"/>.
     </para>
 
     <para>
-      You might also see <literal>DISABLED</literal> for the
-      <literal>InnoDB</literal> or <literal>BDB</literal> storage
-      engines if the server was compiled to support them, but was
-      started with the <option>--skip-innodb</option> or
-      <option>--skip-bdb</option> options at runtime. For the
-      <literal>NDB Cluster</literal> storage engine,
-      <literal>DISABLED</literal> means the server was compiled with
-      support for MySQL Cluster, but was not started with the
-      <option>--ndb-cluster</option> option.
+      You might also see <literal>DISABLED</literal> for a storage
+      engine if the server was compiled to support it, but was started
+      with a <option>--skip-<replaceable>engine</replaceable></option>
+      or. For example, <option>--skip-innodb</option> disalbes the
+      <literal>InnoDB</literal> engine. For the <literal>NDB
+      Cluster</literal> storage engine, <literal>DISABLED</literal>
+      means the server was compiled with support for MySQL Cluster, but
+      was not started with the <option>--ndb-cluster</option> option.
     </para>
 
     <para>

Thread
svn commit - mysqldoc@docsrva: r979 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul22 Jan