List:Commits« Previous MessageNext Message »
From:paul Date:January 25 2006 4:15am
Subject:svn commit - mysqldoc@docsrva: r1030 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-25 05:15:33 +0100 (Wed, 25 Jan 2006)
New Revision: 1030

Log:
 r6663@frost:  paul | 2006-01-24 22:14:39 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-4.1/innodb.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -2531,7 +2531,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable>
+ALTER TABLE <replaceable>tbl_name</replaceable>
     ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>id</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
     REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
     [ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -2564,7 +2564,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
       <para>

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -610,7 +610,7 @@
           </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
           <para>
@@ -1078,11 +1078,13 @@
         <literal>NULL</literal> values only if you are using MySQL
         3.23.2 or newer and are using the <literal>MyISAM</literal>,
         <literal>InnoDB</literal>, or <literal>BDB</literal> storage
-        engine. You can only add an index on a <literal>BLOB</literal>
-        or <literal>TEXT</literal> column if you are using MySQL 3.23.2
-        or newer and are using the <literal>MyISAM</literal> or
-        <literal>BDB</literal> storage engine, or MySQL 4.0.14 or newer
-        and the <literal>InnoDB</literal> storage engine.
+        engine. This is also true for <literal>MEMORY</literal> tables
+        as of MySQL 4.0.2. You can only add an index on a
+        <literal>BLOB</literal> or <literal>TEXT</literal> column if you
+        are using MySQL 3.23.2 or newer and are using the
+        <literal>MyISAM</literal> or <literal>BDB</literal> storage
+        engine, or MySQL 4.0.14 or newer and the
+        <literal>InnoDB</literal> storage engine.
       </para>
 
       <para>
@@ -1971,7 +1973,8 @@
       <para>
         The <replaceable>table_options</replaceable> part of the
         <literal>CREATE TABLE</literal> syntax can be used in MySQL 3.23
-        and above.
+        and above. The <literal>=</literal> that separates an option
+        name and its value is optional as of MySQL 4.1.
       </para>
 
       <para>
@@ -1985,14 +1988,15 @@
       </para>
 
       <para>
-        The <literal>ENGINE</literal> and <literal>TYPE</literal>
-        options take the following values:
+        The <literal>ENGINE</literal> and <literal>TYPE</literal> table
+        options take the storage engine names shown in the following
+        table.
       </para>
 
       <informaltable>
         <tgroup cols="2">
           <colspec colwidth="25*"/>
-          <colspec colwidth="70*"/>
+          <colspec colwidth="75*"/>
           <tbody>
             <row>
               <entry><emphasis role="bold">Storage Engine</emphasis></entry>
@@ -2061,11 +2065,6 @@
       </informaltable>
 
       <para>
-        For more information about MySQL's storage engines, see
-        <xref linkend="storage-engines"/>.
-      </para>
-
-      <para>
         If a storage engine is specified that is not available, MySQL
         uses <literal>MyISAM</literal> instead. For example, if a table
         definition includes the <literal>ENGINE=BDB</literal> option but
@@ -2612,7 +2611,7 @@
       </para>
 
       <para>
-        To ensure that the update log/binary log can be used to
+        To ensure that the update log or binary log can be used to
         re-create the original tables, MySQL does not allow concurrent
         inserts during <literal>CREATE TABLE ... SELECT</literal>.
       </para>
@@ -2882,9 +2881,9 @@
                 </row>
                 <row>
                   <entry><literal>.db</literal></entry>
+                  <entry><literal>.frm</literal></entry>
                   <entry/>
                   <entry/>
-                  <entry><literal>.frm</literal></entry>
                 </row>
               </tbody>
             </tgroup>

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-5.0/innodb.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -2570,7 +2570,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable>
+ALTER TABLE <replaceable>tbl_name</replaceable>
     ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>id</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
     REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
     [ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -2603,7 +2603,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
       <para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -649,7 +649,7 @@
           </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
           <para>
@@ -728,13 +728,6 @@
             to a table (for example, with <literal>ALTER TABLE ... ADD
             column</literal>).
           </para>
-
-          <para>
-            <emphasis role="bold">Warning</emphasis>: <literal>ALTER
-            TABLE ... DEFAULT CHARACTER SET</literal> and <literal>ALTER
-            TABLE ... CHARACTER SET</literal> are equivalent and change
-            only the default table character set.
-          </para>
         </listitem>
 
         <listitem>
@@ -1123,8 +1116,9 @@
           <para>
             You can add an index on a column that can have
             <literal>NULL</literal> values only if you are using the
-            <literal>MyISAM</literal>, <literal>InnoDB</literal>, or
-            <literal>BDB</literal> storage engine.
+            <literal>MyISAM</literal>, <literal>InnoDB</literal>,
+            <literal>BDB</literal>, or <literal>MEMORY</literal> storage
+            engine.
           </para>
         </listitem>
 
@@ -1333,23 +1327,23 @@
 <replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
 
 <replaceable>table_option</replaceable>:
-    {ENGINE|TYPE} = <replaceable>engine_name</replaceable>
-  | AUTO_INCREMENT = <replaceable>value</replaceable>
-  | AVG_ROW_LENGTH = <replaceable>value</replaceable>
+    {ENGINE|TYPE} [=] <replaceable>engine_name</replaceable>
+  | AUTO_INCREMENT [=] <replaceable>value</replaceable>
+  | AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
   | [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
-  | CHECKSUM = {0 | 1}
-  | COMMENT = '<replaceable>string</replaceable>'
-  | CONNECTION = '<replaceable>connect_string</replaceable>'
-  | MAX_ROWS = <replaceable>value</replaceable>
-  | MIN_ROWS = <replaceable>value</replaceable>
-  | PACK_KEYS = {0 | 1 | DEFAULT}
-  | PASSWORD = '<replaceable>string</replaceable>'
-  | DELAY_KEY_WRITE = {0 | 1}
-  | ROW_FORMAT = {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}
-  | UNION = (<replaceable>tbl_name</replaceable>[,<replaceable>tbl_name</replaceable>]...)
-  | INSERT_METHOD = { NO | FIRST | LAST }
-  | DATA DIRECTORY = '<replaceable>absolute path to directory</replaceable>'
-  | INDEX DIRECTORY = '<replaceable>absolute path to directory</replaceable>'
+  | CHECKSUM [=] {0 | 1}
+  | COMMENT [=] '<replaceable>string</replaceable>'
+  | CONNECTION [=] '<replaceable>connect_string</replaceable>'
+  | MAX_ROWS [=] <replaceable>value</replaceable>
+  | MIN_ROWS [=] <replaceable>value</replaceable>
+  | PACK_KEYS [=] {0 | 1 | DEFAULT}
+  | PASSWORD [=] '<replaceable>string</replaceable>'
+  | DELAY_KEY_WRITE [=] {0 | 1}
+  | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}
+  | UNION [=] (<replaceable>tbl_name</replaceable>[,<replaceable>tbl_name</replaceable>]...)
+  | INSERT_METHOD [=] { NO | FIRST | LAST }
+  | DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
+  | INDEX DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
 
 <replaceable>select_statement:</replaceable>
     [IGNORE | REPLACE] [AS] SELECT ...   (<replaceable>Some legal select statement</replaceable>)
@@ -2088,14 +2082,14 @@
       </itemizedlist>
 
       <para>
-        The <literal>ENGINE</literal> and <literal>TYPE</literal>
-        options specify the storage engine for the table.
+        The <literal>ENGINE</literal> table option specifies the storage
+        engine for the table. <literal>TYPE</literal> is a synonym, but
         <literal>ENGINE</literal> is the preferred option name.
       </para>
 
       <para>
-        The <literal>ENGINE</literal> and <literal>TYPE</literal>
-        options take the following values:
+        The <literal>ENGINE</literal> table option takes the storage
+        engine names shown in the following table.
       </para>
 
       <informaltable>
@@ -2134,7 +2128,7 @@
             </row>
             <row>
               <entry><literal>HEAP</literal></entry>
-              <entry>See <xref linkend="memory-storage-engine"/>.</entry>
+              <entry>This is a synonym for <literal>MEMORY</literal>.</entry>
             </row>
             <row>
               <entry><literal>ISAM</literal> (<emphasis>OBSOLETE</emphasis>)</entry>
@@ -2142,8 +2136,7 @@
                 &current-series; from a previous version, you should
                 convert any existing <literal>ISAM</literal> tables to
                 <literal>MyISAM</literal> <emphasis>before</emphasis>
-                performing the upgrade. See
-                <xref linkend="storage-engines"/>.</entry>
+                performing the upgrade.</entry>
             </row>
             <row>
               <entry><literal>InnoDB</literal></entry>
@@ -2152,8 +2145,8 @@
             </row>
             <row>
               <entry><literal>MEMORY</literal></entry>
-              <entry>The data for this storage engine is stored only in memory. (Known in
-                earlier MySQL versions as <literal>HEAP</literal>.)</entry>
+              <entry>The data for this storage engine is stored only in memory. See
+                <xref linkend="memory-storage-engine"/>.</entry>
             </row>
             <row>
               <entry><literal>MERGE</literal></entry>
@@ -2178,11 +2171,6 @@
       </informaltable>
 
       <para>
-        For more information about MySQL's storage engines, see
-        <xref linkend="storage-engines"/>.
-      </para>
-
-      <para>
         If a storage engine is specified that is not available, MySQL
         uses <literal>MyISAM</literal> instead. For example, if a table
         definition includes the <literal>ENGINE=BDB</literal> option but
@@ -2695,9 +2683,9 @@
       </para>
 
       <para>
-        To ensure that the update log/binary log can be used to
-        re-create the original tables, MySQL does not allow concurrent
-        inserts during <literal>CREATE TABLE ... SELECT</literal>.
+        To ensure that the binary log can be used to re-create the
+        original tables, MySQL does not allow concurrent inserts during
+        <literal>CREATE TABLE ... SELECT</literal>.
       </para>
 
       <section id="silent-column-changes">
@@ -2959,11 +2947,10 @@
           </para>
 
           <informaltable>
-            <tgroup cols="4">
+            <tgroup cols="3">
               <colspec colwidth="10*"/>
               <colspec colwidth="10*"/>
               <colspec colwidth="10*"/>
-              <colspec colwidth="10*"/>
               <tbody>
                 <row>
                   <entry><literal>.BAK</literal></entry>

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-5.1/innodb.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -2545,7 +2545,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable>
+ALTER TABLE <replaceable>tbl_name</replaceable>
     ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>id</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
     REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
     [ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -2578,7 +2578,7 @@
       </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
       <para>

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-01-25 04:15:33 UTC (rev 1030)
@@ -110,3 +110,4 @@
 server-side-scripts server-side-overview
 instance-manager-command-line-options instance-manager-command-options
 upgrading-grant-tables mysql-fix-privilege-tables
+silent-column-changes ../../5.0/en/silent-column-changes

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-25 04:15:04 UTC (rev 1029)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-25 04:15:33 UTC (rev 1030)
@@ -647,7 +647,7 @@
           </para>
 
 <programlisting>
-ALTER TABLE <replaceable>yourtablename</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
+ALTER TABLE <replaceable>tbl_name</replaceable> DROP FOREIGN KEY <replaceable>fk_symbol</replaceable>;
 </programlisting>
 
           <para>
@@ -726,13 +726,6 @@
             to a table (for example, with <literal>ALTER TABLE ... ADD
             column</literal>).
           </para>
-
-          <para>
-            <emphasis role="bold">Warning</emphasis>: <literal>ALTER
-            TABLE ... DEFAULT CHARACTER SET</literal> and <literal>ALTER
-            TABLE ... CHARACTER SET</literal> are equivalent and change
-            only the default table character set.
-          </para>
         </listitem>
 
         <listitem>
@@ -1334,8 +1327,9 @@
           <para>
             You can add an index on a column that can have
             <literal>NULL</literal> values only if you are using the
-            <literal>MyISAM</literal>, <literal>InnoDB</literal>, or
-            <literal>BDB</literal> storage engine.
+            <literal>MyISAM</literal>, <literal>InnoDB</literal>,
+            <literal>BDB</literal>, or <literal>MEMORY</literal> storage
+            engine.
           </para>
         </listitem>
 
@@ -1551,23 +1545,23 @@
 <replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
 
 <replaceable>table_option</replaceable>:
-    {ENGINE|TYPE} = <replaceable>engine_name</replaceable>
-  | AUTO_INCREMENT = <replaceable>value</replaceable>
-  | AVG_ROW_LENGTH = <replaceable>value</replaceable>
+    {ENGINE|TYPE} [=] <replaceable>engine_name</replaceable>
+  | AUTO_INCREMENT [=] <replaceable>value</replaceable>
+  | AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
   | [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
-  | CHECKSUM = {0 | 1}
-  | COMMENT = '<replaceable>string</replaceable>'
-  | CONNECTION = '<replaceable>connect_string</replaceable>'
-  | MAX_ROWS = <replaceable>value</replaceable>
-  | MIN_ROWS = <replaceable>value</replaceable>
-  | PACK_KEYS = {0 | 1 | DEFAULT}
-  | PASSWORD = '<replaceable>string</replaceable>'
-  | DELAY_KEY_WRITE = {0 | 1}
-  | ROW_FORMAT = {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}
-  | UNION = (<replaceable>tbl_name</replaceable>[,<replaceable>tbl_name</replaceable>]...)
-  | INSERT_METHOD = { NO | FIRST | LAST }
-  | DATA DIRECTORY = '<replaceable>absolute path to directory</replaceable>'
-  | INDEX DIRECTORY = '<replaceable>absolute path to directory</replaceable>'
+  | CHECKSUM [=] {0 | 1}
+  | COMMENT [=] '<replaceable>string</replaceable>'
+  | CONNECTION [=] '<replaceable>connect_string</replaceable>'
+  | MAX_ROWS [=] <replaceable>value</replaceable>
+  | MIN_ROWS [=] <replaceable>value</replaceable>
+  | PACK_KEYS [=] {0 | 1 | DEFAULT}
+  | PASSWORD [=] '<replaceable>string</replaceable>'
+  | DELAY_KEY_WRITE [=] {0 | 1}
+  | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}
+  | UNION [=] (<replaceable>tbl_name</replaceable>[,<replaceable>tbl_name</replaceable>]...)
+  | INSERT_METHOD [=] { NO | FIRST | LAST }
+  | DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
+  | INDEX DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
 
 <replaceable>partition_options</replaceable>:
     PARTITION BY
@@ -1581,13 +1575,11 @@
          | [LINEAR] KEY(<replaceable>column_list</replaceable>)
       [SUBPARTITIONS <replaceable>num</replaceable>]  
     ]
-    [(<replaceable>partition_definition</replaceable>), [(<replaceable>partition_definition</replaceable>)], ...]
+    [(<replaceable>partition_definition</replaceable>) [, (<replaceable>partition_definition</replaceable>)] ...]
 
 <replaceable>partition_definition</replaceable>:
     PARTITION <replaceable>partition_name</replaceable>
-        [VALUES { 
-                  LESS THAN (<replaceable>expr</replaceable>) | <literal>MAXVALUE</literal> 
-                | IN (<replaceable>value_list</replaceable>) }]
+        [VALUES {LESS THAN (<replaceable>expr</replaceable>) | <literal>MAXVALUE</literal> | IN (<replaceable>value_list</replaceable>)}]
         [[STORAGE] ENGINE [=] <replaceable>engine-name</replaceable>]
         [COMMENT [=] <replaceable>'comment_text'</replaceable> ]
         [DATA DIRECTORY [=] '<filename><replaceable>data_dir</replaceable></filename>']
@@ -1596,7 +1588,7 @@
         [MIN_ROWS [=] <replaceable>min_number_of_rows</replaceable>]
         [TABLESPACE [=] (<replaceable>tablespace_name</replaceable>)]
         [NODEGROUP [=] <replaceable>node_group_id</replaceable>]
-        [(<replaceable>subpartition_definition</replaceable>), [(<replaceable>subpartition_definition</replaceable>)], ...]
+        [(<replaceable>subpartition_definition</replaceable>) [, (<replaceable>subpartition_definition</replaceable>)] ...]
 
 <replaceable>subpartition_definition</replaceable>:
     SUBPARTITION <replaceable>logical_name</replaceable>
@@ -2299,14 +2291,14 @@
       </itemizedlist>
 
       <para>
-        The <literal>ENGINE</literal> and <literal>TYPE</literal>
-        options specify the storage engine for the table.
+        The <literal>ENGINE</literal> table option specifies the storage
+        engine for the table. <literal>TYPE</literal> is a synonym, but
         <literal>ENGINE</literal> is the preferred option name.
       </para>
 
       <para>
-        The <literal>ENGINE</literal> and <literal>TYPE</literal>
-        options take the following values:
+        The <literal>ENGINE</literal> table option takes the storage
+        engine names shown in the following table.
       </para>
 
       <informaltable>
@@ -2345,7 +2337,7 @@
             </row>
             <row>
               <entry><literal>HEAP</literal></entry>
-              <entry>See <xref linkend="memory-storage-engine"/>.</entry>
+              <entry>This is a synonym for <literal>MEMORY</literal>.</entry>
             </row>
             <row>
               <entry><literal>ISAM</literal> (<emphasis>OBSOLETE</emphasis>)</entry>
@@ -2353,8 +2345,7 @@
                 &current-series; from a previous version, you should
                 convert any existing <literal>ISAM</literal> tables to
                 <literal>MyISAM</literal> <emphasis>before</emphasis>
-                performing the upgrade. See
-                <xref linkend="storage-engines"/>.</entry>
+                performing the upgrade.</entry>
             </row>
             <row>
               <entry><literal>InnoDB</literal></entry>
@@ -2363,8 +2354,8 @@
             </row>
             <row>
               <entry><literal>MEMORY</literal></entry>
-              <entry>The data for this storage engine is stored only in memory. (Known in
-                earlier MySQL versions as <literal>HEAP</literal>.)</entry>
+              <entry>The data for this storage engine is stored only in memory. See
+                <xref linkend="memory-storage-engine"/>.</entry>
             </row>
             <row>
               <entry><literal>MERGE</literal></entry>
@@ -2389,11 +2380,6 @@
       </informaltable>
 
       <para>
-        For more information about MySQL's storage engines, see
-        <xref linkend="storage-engines"/>.
-      </para>
-
-      <para>
         If a storage engine is specified that is not available, MySQL
         uses <literal>MyISAM</literal> instead. For example, if a table
         definition includes the <literal>ENGINE=BDB</literal> option but
@@ -3397,9 +3383,9 @@
       </para>
 
       <para>
-        To ensure that the update log/binary log can be used to
-        re-create the original tables, MySQL does not allow concurrent
-        inserts during <literal>CREATE TABLE ... SELECT</literal>.
+        To ensure that the binary log can be used to re-create the
+        original tables, MySQL does not allow concurrent inserts during
+        <literal>CREATE TABLE ... SELECT</literal>.
       </para>
 
     </section>
@@ -3495,11 +3481,10 @@
           </para>
 
           <informaltable>
-            <tgroup cols="4">
+            <tgroup cols="3">
               <colspec colwidth="10*"/>
               <colspec colwidth="10*"/>
               <colspec colwidth="10*"/>
-              <colspec colwidth="10*"/>
               <tbody>
                 <row>
                   <entry><literal>.BAK</literal></entry>

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