List:Commits« Previous MessageNext Message »
From:paul Date:January 9 2006 2:09am
Subject:svn commit - mysqldoc@docsrva: r730 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-09 03:09:54 +0100 (Mon, 09 Jan 2006)
New Revision: 730

Log:
 r5976@frost:  paul | 2006-01-08 20:09:36 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/problems.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/problems.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/problems.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/storage-engines.xml
   trunk/refman-5.1/tutorial.xml


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -4705,8 +4705,8 @@
 
     <remark role="todo">
       This is no longer fully accurate. mysqlcheck can be used for some
-      operations on table types other than MyISAM. There probably should
-      be more reference to this program from within the table
+      operations on storage engines other than MyISAM. There probably
+      should be more reference to this program from within the table
       maintenance section.
     </remark>
 

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/connector-j.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2606,9 +2606,9 @@
             Foreign Key information (getImported/ExportedKeys() and
             getCrossReference()) is only available from 'InnoDB'-type
             tables. However, the driver uses 'SHOW CREATE TABLE' to
-            retrieve this information, so when other table types support
-            foreign keys, the driver will transparently support them as
-            well.
+            retrieve this information, so when other storage engines
+            support foreign keys, the driver will transparently support
+            them as well.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -5355,7 +5355,7 @@
       </para>
 
       <para>
-        Also, if your server supports transactional table types
+        Also, if your server supports transactional storage engines
         (<literal>InnoDB</literal> and <literal>BDB</literal>) make sure
         the <literal>disable transactions</literal> option is not set
         from the DSN configuration.

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/database-administration.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2335,8 +2335,8 @@
             </para>
 
             <para>
-              Set the default table type for tables. See
-              <xref linkend="storage-engines"/>.
+              Set the default table type (storage engine) for tables.
+              See <xref linkend="storage-engines"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/functions.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -13938,7 +13938,7 @@
           <para>
             This optimization applies only to <literal>MyISAM</literal>
             and <literal>ISAM</literal> tables only, because an exact
-            record count is stored for these table types and can be
+            record count is stored for these storage engines and can be
             accessed very quickly. For transactional storage engines
             (<literal>InnoDB</literal>, <literal>BDB</literal>), storing
             an exact row count is more problematic because multiple

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/innodb.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -64,9 +64,9 @@
       escalation in <literal>InnoDB</literal> because row-level locks in
       <literal>InnoDB</literal> fit in very little space.
       <literal>InnoDB</literal> also supports <literal>FOREIGN
-      KEY</literal> constraints. In SQL queries you can freely mix
-      <literal>InnoDB</literal> type tables with other table types of
-      MySQL, even within the same query.
+      KEY</literal> constraints. You can freely mix
+      <literal>InnoDB</literal> tables with tables from other MySQL
+      storage engines, even within the same statement.
     </para>
 
     <para>
@@ -94,7 +94,7 @@
       <literal>InnoDB</literal> support in MySQL 3.23, see
       <xref linkend="innodb-in-mysql-3-23"/>. Starting from MySQL 4.1.5,
       the improved Windows installer makes <literal>InnoDB</literal> the
-      MySQL default table type on Windows.
+      MySQL default storage engine on Windows.
     </para>
 
     <para>
@@ -1967,7 +1967,7 @@
       TABLE STATUS</literal> statement for any <literal>InnoDB</literal>
       table. The amount of free space in the tablespace appears in the
       <literal>Comment</literal> section in the output of <literal>SHOW
-      TABLE STATUS</literal>. An example:
+      TABLE STATUS</literal>. For example:
     </para>
 
 <programlisting>
@@ -2450,15 +2450,15 @@
 
       <para>
         If MySQL reports an error number 1005 from a <literal>CREATE
-        TABLE</literal> statement, and the error message string refers
-        to errno 150, this means that the table creation failed because
-        a foreign key constraint was not correctly formed. Similarly, if
-        an <literal>ALTER TABLE</literal> fails and it refers to errno
-        150, that means a foreign key definition would be incorrectly
-        formed for the altered table. Starting from MySQL 4.0.13, you
-        can use <literal>SHOW INNODB STATUS</literal> to display a
-        detailed explanation of the latest <literal>InnoDB</literal>
-        foreign key error in the server.
+        TABLE</literal> statement, and the error message refers to errno
+        150, this means that the table creation failed because a foreign
+        key constraint was not correctly formed. Similarly, if an
+        <literal>ALTER TABLE</literal> fails and it refers to errno 150,
+        that means a foreign key definition would be incorrectly formed
+        for the altered table. Starting from MySQL 4.0.13, you can use
+        <literal>SHOW INNODB STATUS</literal> to display a detailed
+        explanation of the latest <literal>InnoDB</literal> foreign key
+        error in the server.
       </para>
 
       <para>
@@ -2612,7 +2612,7 @@
         <literal>fk_symbol</literal> value is internally generated by
         <literal>InnoDB</literal> when the foreign key is created. To
         find out the symbol when you want to drop a foreign key, use the
-        <literal>SHOW CREATE TABLE</literal> statement. An example:
+        <literal>SHOW CREATE TABLE</literal> statement. For example:
       </para>
 
 <programlisting>
@@ -2756,7 +2756,7 @@
         referencing it. It must have the right column names and types,
         and it must have indexes on the referenced keys, as stated
         earlier. If these are not satisfied, MySQL returns error number
-        1005 and refers to errno 150 in the error message string.
+        1005 and refers to errno 150 in the error message.
       </para>
 
     </section>
@@ -2772,9 +2772,9 @@
       <para>
         MySQL replication works for <literal>InnoDB</literal> tables as
         it does for <literal>MyISAM</literal> tables. It is also
-        possible to use replication in a way where the table type on the
-        slave is not the same as the original table type on the master.
-        For example, you can replicate modifications to an
+        possible to use replication in a way where the storage engine on
+        the slave is not the same as the original storage engine on the
+        master. For example, you can replicate modifications to an
         <literal>InnoDB</literal> table on the master to a
         <literal>MyISAM</literal> table on the slave.
       </para>
@@ -4898,8 +4898,8 @@
 </programlisting>
 
         <para>
-          This tip is valid for inserts into any table type, not just
-          <literal>InnoDB</literal>.
+          This tip is valid for inserts into any storage engine, not
+          just <literal>InnoDB</literal>.
         </para>
       </listitem>
 
@@ -5991,7 +5991,7 @@
           </para>
 
           <para>
-            Cannot create table. If the error message string refers to
+            Cannot create table. If the error message refers to
             <literal>errno</literal> 150, table creation failed because
             a foreign key constraint was not correctly formed.
           </para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/installing.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -13028,8 +13028,8 @@
 </programlisting>
 
           <para>
-            If you are not sure of the table type for a given table, use
-            this statement:
+            If you are not sure of the storage engine for a given table,
+            use this statement:
           </para>
 
 <programlisting>

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/introduction.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2085,21 +2085,22 @@
 
         <para>
           As noted, the trade-off for transactional versus
-          non-transactional table types lies mostly in performance.
+          non-transactional storage engines lies mostly in performance.
           Transactional tables have significantly higher memory and disk
           space requirements, and more CPU overhead. On the other hand,
-          transactional table types such as <literal>InnoDB</literal>
-          also offer many significant features. MySQL Server's modular
-          design allows the concurrent use of different storage engines
-          to suit different requirements and deliver optimum performance
-          in all situations.
+          transactional storage engines such as
+          <literal>InnoDB</literal> also offer many significant
+          features. MySQL Server's modular design allows the concurrent
+          use of different storage engines to suit different
+          requirements and deliver optimum performance in all
+          situations.
         </para>
 
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the non-transactional
           <literal>MyISAM</literal> tables, and how do these features
-          compare with the transactional table types?
+          compare with the transactional storage engines?
         </para>
 
         <itemizedlist>

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -488,9 +488,9 @@
       <listitem>
         <para>
           For our sample data, we will use the <literal>world</literal>
-          database which is available for download from the MySQL AB
-          Web site. As this database takes up a relatively small amount
-          of space, we assume that each machine has 256 MB RAM, which
+          database which is available for download from the MySQL AB Web
+          site. As this database takes up a relatively small amount of
+          space, we assume that each machine has 256 MB RAM, which
           should be sufficient for running the operating system, host
           NDB process, and (for the data nodes) for storing the
           database.
@@ -9537,11 +9537,12 @@
 
       <listitem>
         <para>
-          <emphasis>What table types does Cluster support?</emphasis>
+          <emphasis>What storage engines does Cluster
+          support?</emphasis>
         </para>
 
         <para>
-          <literal>NDB</literal> is the only MySQL storage engine which
+          <literal>NDB</literal> is the only MySQL storage engine that
           supports clustering.
         </para>
 

Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/optimization.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -4809,8 +4809,8 @@
       <para>
         For <literal>InnoDB</literal> and <literal>BDB</literal> tables,
         MySQL uses only table locking if you explicitly lock the table
-        with <literal>LOCK TABLES</literal>. For these table types, we
-        recommend that you not use <literal>LOCK TABLES</literal> at
+        with <literal>LOCK TABLES</literal>. For these storage engines,
+        we recommend that you not use <literal>LOCK TABLES</literal> at
         all, because <literal>InnoDB</literal> uses automatic row-level
         locking and <literal>BDB</literal> uses page-level locking to
         ensure transaction isolation.
@@ -8213,9 +8213,9 @@
 
         <para>
           In MySQL 4.0, symlinks are fully supported only for
-          <literal>MyISAM</literal> tables. For other table types, you
-          may get strange problems if you try to use symbolic links on
-          files in the operating system with any of the preceding
+          <literal>MyISAM</literal> tables. For other storage engines,
+          you may get strange problems if you try to use symbolic links
+          on files in the operating system with any of the preceding
           statements.
         </para>
 

Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/problems.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2741,9 +2741,9 @@
           <para>
             You have found a bug in the data storage code. This isn't
             likely, but it's at least possible. In this case, you can
-            try to change the table type to another storage engine by
-            using <literal>ALTER TABLE</literal> on a repaired copy of
-            the table.
+            try to change the storage engine to another engine by using
+            <literal>ALTER TABLE</literal> on a repaired copy of the
+            table.
           </para>
         </listitem>
 
@@ -3801,7 +3801,7 @@
       </para>
 
       <para>
-        You can check the table type for a table by using either of
+        You can check the storage engine for a table by using either of
         these statements:
       </para>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -1082,12 +1082,12 @@
         You can add an index on a column that can have
         <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> table type.
-        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> table type, or MySQL 4.0.14 or newer and
-        the <literal>InnoDB</literal> table type.
+        <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.
       </para>
 
       <para>
@@ -3279,7 +3279,7 @@
         <replaceable>tbl_name</replaceable></literal> (without a
         <literal>WHERE</literal> clause) in
         <literal>AUTOCOMMIT</literal> mode, the sequence starts over for
-        all table types except <literal>InnoDB</literal> and (as of
+        all storage engines except <literal>InnoDB</literal> and (as of
         MySQL 4.0) <literal>MyISAM</literal>. There are some exceptions
         to this behavior for <literal>InnoDB</literal> tables, as
         discussed in <xref linkend="innodb-auto-increment-column"/>.
@@ -11941,7 +11941,7 @@
 
         <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
-          table types by starting <command>mysqld</command> with the
+          storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
           option; in this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.

Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/storage-engines.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -313,19 +313,19 @@
   </para>
 
   <para>
-    This automatic substitution of the <literal>MyISAM</literal> table
-    type when an unavailable type is specified can be confusing for new
-    MySQL users. In MySQL 4.1, a warning is generated when a table type
-    is automatically changed.
+    This automatic substitution of the <literal>MyISAM</literal> storage
+    engine when an unavailable engine is specified can be confusing for
+    new MySQL users. In MySQL 4.1, a warning is generated when a storage
+    engine is automatically changed.
   </para>
 
   <para>
     MySQL always creates an <filename>.frm</filename> file to hold the
     table and column definitions. The table's index and data may be
-    stored in one or more other files, depending on the table type. The
-    server creates the <filename>.frm</filename> file above the storage
-    engine level. Individual storage engines create any additional files
-    required for the tables that they manage.
+    stored in one or more other files, depending on the storage engine.
+    The server creates the <filename>.frm</filename> file above the
+    storage engine level. Individual storage engines create any
+    additional files required for the tables that they manage.
   </para>
 
   <para>
@@ -381,9 +381,9 @@
 
   <para>
     Although MySQL supports several transaction-safe storage engines,
-    for best results, you should not mix different table types within a
-    transaction. For information about the problems that can occur if
-    you do this, see <xref linkend="commit"/>.
+    for best results, you should not mix different storage engines
+    within a transaction. For information about the problems that can
+    occur if you do this, see <xref linkend="commit"/>.
   </para>
 
   <para>
@@ -1932,11 +1932,11 @@
         <listitem>
           <para>
             If you use <literal>ALTER TABLE</literal> to change a
-            <literal>MERGE</literal> table to another table type, the
-            mapping to the underlying tables is lost. Instead, the rows
-            from the underlying <literal>MyISAM</literal> tables are
-            copied into the altered table, which is then assigned the
-            new type.
+            <literal>MERGE</literal> table to another storage engine,
+            the mapping to the underlying tables is lost. Instead, the
+            rows from the underlying <literal>MyISAM</literal> tables
+            are copied into the altered table, which is then assigned
+            the new type.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-4.1/tutorial.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -3416,8 +3416,9 @@
 
       <para>
         A foreign key constraint is not required merely to join two
-        tables. For table types other than <literal>InnoDB</literal>, it
-        is possible when defining a column to use a <literal>REFERENCES
+        tables. For storage engines other than
+        <literal>InnoDB</literal>, it is possible when defining a column
+        to use a <literal>REFERENCES
         <replaceable>tbl_name</replaceable>(<replaceable>col_name</replaceable>)</literal>
         clause, which has no actual effect, and <emphasis>serves only as
         a memo or comment to you that the column which you are currently

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -4853,8 +4853,8 @@
 
     <remark role="todo">
       This is no longer fully accurate. mysqlcheck can be used for some
-      operations on table types other than MyISAM. There probably should
-      be more reference to this program from within the table
+      operations on storage engines other than MyISAM. There probably
+      should be more reference to this program from within the table
       maintenance section.
     </remark>
 
@@ -7418,7 +7418,9 @@
 
             <para>
               Show a column indicating the table type, as in
-              <literal>SHOW FULL TABLES</literal>. Added in MySQL 5.0.4.
+              <literal>SHOW FULL TABLES</literal>. The type is
+              <literal>BASE TABLE</literal> or <literal>VIEW</literal>.
+              Added in MySQL 5.0.4.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/connector-j.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2606,9 +2606,9 @@
             Foreign Key information (getImported/ExportedKeys() and
             getCrossReference()) is only available from 'InnoDB'-type
             tables. However, the driver uses 'SHOW CREATE TABLE' to
-            retrieve this information, so when other table types support
-            foreign keys, the driver will transparently support them as
-            well.
+            retrieve this information, so when other storage engines
+            support foreign keys, the driver will transparently support
+            them as well.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -5355,7 +5355,7 @@
       </para>
 
       <para>
-        Also, if your server supports transactional table types
+        Also, if your server supports transactional storage engines
         (<literal>InnoDB</literal> and <literal>BDB</literal>) make sure
         the <literal>disable transactions</literal> option is not set
         from the DSN configuration.

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/database-administration.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -3140,8 +3140,8 @@
             </para>
 
             <para>
-              Set the default table type for tables. See
-              <xref linkend="storage-engines"/>.
+              Set the default table type (storage engine) for tables.
+              See <xref linkend="storage-engines"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/functions.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -14009,7 +14009,7 @@
           <para>
             This optimization applies only to <literal>MyISAM</literal>
             tables only, because an exact record count is stored for
-            these table types and can be accessed very quickly. For
+            this storage engine and can be accessed very quickly. For
             transactional storage engines (<literal>InnoDB</literal>,
             <literal>BDB</literal>), storing an exact row count is more
             problematic because multiple transactions may be occurring,

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/innodb.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -64,9 +64,9 @@
       escalation in <literal>InnoDB</literal> because row-level locks in
       <literal>InnoDB</literal> fit in very little space.
       <literal>InnoDB</literal> also supports <literal>FOREIGN
-      KEY</literal> constraints. In SQL queries you can freely mix
-      <literal>InnoDB</literal> type tables with other table types of
-      MySQL, even within the same query.
+      KEY</literal> constraints. You can freely mix
+      <literal>InnoDB</literal> tables with tables from other MySQL
+      storage engines, even within the same statement.
     </para>
 
     <para>
@@ -91,7 +91,8 @@
     <para>
       <literal>InnoDB</literal> is included in binary distributions by
       default. The Windows Essentials installer makes
-      <literal>InnoDB</literal> the MySQL default table type on Windows.
+      <literal>InnoDB</literal> the MySQL default storage engine on
+      Windows.
     </para>
 
     <para>
@@ -2000,7 +2001,7 @@
       TABLE STATUS</literal> statement for any <literal>InnoDB</literal>
       table. The amount of free space in the tablespace appears in the
       <literal>Comment</literal> section in the output of <literal>SHOW
-      TABLE STATUS</literal>. An example:
+      TABLE STATUS</literal>. For example:
     </para>
 
 <programlisting>
@@ -2473,14 +2474,14 @@
 
       <para>
         If MySQL reports an error number 1005 from a <literal>CREATE
-        TABLE</literal> statement, and the error message string refers
-        to errno 150, this means that the table creation failed because
-        a foreign key constraint was not correctly formed. Similarly, if
-        an <literal>ALTER TABLE</literal> fails and it refers to errno
-        150, that means a foreign key definition would be incorrectly
-        formed for the altered table. You can use <literal>SHOW ENGINE
-        INNODB STATUS</literal> to display a detailed explanation of the
-        most recent <literal>InnoDB</literal> foreign key error in the
+        TABLE</literal> statement, and the error message refers to errno
+        150, this means that the table creation failed because a foreign
+        key constraint was not correctly formed. Similarly, if an
+        <literal>ALTER TABLE</literal> fails and it refers to errno 150,
+        that means a foreign key definition would be incorrectly formed
+        for the altered table. You can use <literal>SHOW ENGINE INNODB
+        STATUS</literal> to display a detailed explanation of the most
+        recent <literal>InnoDB</literal> foreign key error in the
         server.
       </para>
 
@@ -2638,7 +2639,7 @@
         Otherwise, the <literal>fk_symbol</literal> value is internally
         generated by <literal>InnoDB</literal> when the foreign key is
         created. To find out the symbol when you want to drop a foreign
-        key, use the <literal>SHOW CREATE TABLE</literal> statement. An
+        key, use the <literal>SHOW CREATE TABLE</literal> statement. For
         example:
       </para>
 
@@ -2780,7 +2781,7 @@
         referencing it. It must have the right column names and types,
         and it must have indexes on the referenced keys, as stated
         earlier. If these are not satisfied, MySQL returns error number
-        1005 and refers to errno 150 in the error message string.
+        1005 and refers to errno 150 in the error message.
       </para>
 
     </section>
@@ -2796,9 +2797,9 @@
       <para>
         MySQL replication works for <literal>InnoDB</literal> tables as
         it does for <literal>MyISAM</literal> tables. It is also
-        possible to use replication in a way where the table type on the
-        slave is not the same as the original table type on the master.
-        For example, you can replicate modifications to an
+        possible to use replication in a way where the storage engine on
+        the slave is not the same as the original storage engine on the
+        master. For example, you can replicate modifications to an
         <literal>InnoDB</literal> table on the master to a
         <literal>MyISAM</literal> table on the slave.
       </para>
@@ -4855,8 +4856,8 @@
 </programlisting>
 
         <para>
-          This tip is valid for inserts into any table type, not just
-          <literal>InnoDB</literal>.
+          This tip is valid for inserts into any storage engine, not
+          just <literal>InnoDB</literal>.
         </para>
       </listitem>
 
@@ -5939,7 +5940,7 @@
           </para>
 
           <para>
-            Cannot create table. If the error message string refers to
+            Cannot create table. If the error message refers to
             <literal>errno</literal> 150, table creation failed because
             a foreign key constraint was not correctly formed.
           </para>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/introduction.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -1709,21 +1709,22 @@
 
         <para>
           As noted, the trade-off for transactional versus
-          non-transactional table types lies mostly in performance.
+          non-transactional storage engines lies mostly in performance.
           Transactional tables have significantly higher memory and disk
           space requirements, and more CPU overhead. On the other hand,
-          transactional table types such as <literal>InnoDB</literal>
-          also offer many significant features. MySQL Server's modular
-          design allows the concurrent use of different storage engines
-          to suit different requirements and deliver optimum performance
-          in all situations.
+          transactional storage engines such as
+          <literal>InnoDB</literal> also offer many significant
+          features. MySQL Server's modular design allows the concurrent
+          use of different storage engines to suit different
+          requirements and deliver optimum performance in all
+          situations.
         </para>
 
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the non-transactional
           <literal>MyISAM</literal> tables, and how do these features
-          compare with the transactional table types?
+          compare with the transactional storage engines?
         </para>
 
         <itemizedlist>

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -494,9 +494,9 @@
       <listitem>
         <para>
           For our sample data, we will use the <literal>world</literal>
-          database which is available for download from the MySQL AB
-          Web site. As this database takes up a relatively small amount
-          of space, we assume that each machine has 256 MB RAM, which
+          database which is available for download from the MySQL AB Web
+          site. As this database takes up a relatively small amount of
+          space, we assume that each machine has 256 MB RAM, which
           should be sufficient for running the operating system, host
           NDB process, and (for the data nodes) for storing the
           database.
@@ -9814,11 +9814,12 @@
 
       <listitem>
         <para>
-          <emphasis>What table types does Cluster support?</emphasis>
+          <emphasis>What storage engines does Cluster
+          support?</emphasis>
         </para>
 
         <para>
-          <literal>NDB</literal> is the only MySQL storage engine which
+          <literal>NDB</literal> is the only MySQL storage engine that
           supports clustering.
         </para>
 

Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/optimization.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -6275,8 +6275,8 @@
       <para>
         For <literal>InnoDB</literal> and <literal>BDB</literal> tables,
         MySQL uses only table locking if you explicitly lock the table
-        with <literal>LOCK TABLES</literal>. For these table types, we
-        recommend that you not use <literal>LOCK TABLES</literal> at
+        with <literal>LOCK TABLES</literal>. For these storage engines,
+        we recommend that you not use <literal>LOCK TABLES</literal> at
         all, because <literal>InnoDB</literal> uses automatic row-level
         locking and <literal>BDB</literal> uses page-level locking to
         ensure transaction isolation.
@@ -9762,14 +9762,14 @@
         </para>
 
         <remark role="todo">
-          Following paras still true for 5.0? [js]
+          Following paras still true for 5.0? [js] (Yes: PD)
         </remark>
 
         <para>
           Symlinks are fully supported only for
-          <literal>MyISAM</literal> tables. For other table types, you
-          may get strange problems if you try to use symbolic links on
-          files in the operating system with any of the preceding
+          <literal>MyISAM</literal> tables. For other storage engines,
+          you may get strange problems if you try to use symbolic links
+          on files in the operating system with any of the preceding
           statements.
         </para>
 

Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/problems.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2708,9 +2708,9 @@
           <para>
             You have found a bug in the data storage code. This isn't
             likely, but it's at least possible. In this case, you can
-            try to change the table type to another storage engine by
-            using <literal>ALTER TABLE</literal> on a repaired copy of
-            the table.
+            try to change the storage engine to another engine by using
+            <literal>ALTER TABLE</literal> on a repaired copy of the
+            table.
           </para>
         </listitem>
 
@@ -3796,7 +3796,7 @@
       </para>
 
       <para>
-        You can check the table type for a table by using either of
+        You can check the storage engine for a table by using either of
         these statements:
       </para>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -1094,7 +1094,7 @@
             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> table type.
+            <literal>BDB</literal> storage engine.
           </para>
         </listitem>
 
@@ -1103,7 +1103,7 @@
             You can add an index on a <literal>BLOB</literal> or
             <literal>TEXT</literal> column only if you are using the
             <literal>MyISAM</literal>, <literal>BDB</literal>, or
-            <literal>InnoDB</literal> table type.
+            <literal>InnoDB</literal> storage engine.
           </para>
         </listitem>
 
@@ -1977,7 +1977,7 @@
           <para>
             You can create special <literal>FULLTEXT</literal> indexes,
             which are used for full-text searches. Only the
-            <literal>MyISAM</literal> table type supports
+            <literal>MyISAM</literal> storage engine supports
             <literal>FULLTEXT</literal> indexes. They can be created
             only from <literal>CHAR</literal>,
             <literal>VARCHAR</literal>, and <literal>TEXT</literal>
@@ -2123,8 +2123,8 @@
             </row>
             <row>
               <entry><literal>MEMORY</literal></entry>
-              <entry>The data for this table type 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. (Known in
+                earlier MySQL versions as <literal>HEAP</literal>.)</entry>
             </row>
             <row>
               <entry><literal>MERGE</literal></entry>
@@ -3315,7 +3315,7 @@
         <replaceable>tbl_name</replaceable></literal> (without a
         <literal>WHERE</literal> clause) in
         <literal>AUTOCOMMIT</literal> mode, the sequence starts over for
-        all table types except <literal>InnoDB</literal> and
+        all storage engines except <literal>InnoDB</literal> and
         <literal>MyISAM</literal>. There are some exceptions to this
         behavior for <literal>InnoDB</literal> tables, as discussed in
         <xref linkend="innodb-auto-increment-column"/>.
@@ -13177,7 +13177,7 @@
 
         <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
-          table types by starting <command>mysqld</command> with the
+          storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
           option; in this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.

Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/storage-engines.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -330,19 +330,19 @@
   </para>
 
   <para>
-    This automatic substitution of the <literal>MyISAM</literal> table
-    type when an unavailable type is specified can be confusing for new
-    MySQL users. A warning is generated whenever a table type is
+    This automatic substitution of the <literal>MyISAM</literal> storage
+    engine when an unavailable engine is specified can be confusing for
+    new MySQL users. A warning is generated whenever a storage engine is
     automatically changed.
   </para>
 
   <para>
     MySQL always creates an <filename>.frm</filename> file to hold the
     table and column definitions. The table's index and data may be
-    stored in one or more other files, depending on the table type. The
-    server creates the <filename>.frm</filename> file above the storage
-    engine level. Individual storage engines create any additional files
-    required for the tables that they manage.
+    stored in one or more other files, depending on the storage engine.
+    The server creates the <filename>.frm</filename> file above the
+    storage engine level. Individual storage engines create any
+    additional files required for the tables that they manage.
   </para>
 
   <para>
@@ -398,9 +398,9 @@
 
   <para>
     Although MySQL supports several transaction-safe storage engines,
-    for best results, you should not mix different table types within a
-    transaction. For information about the problems that can occur if
-    you do this, see <xref linkend="commit"/>.
+    for best results, you should not mix different storage engines
+    within a transaction. For information about the problems that can
+    occur if you do this, see <xref linkend="commit"/>.
   </para>
 
   <para>
@@ -1946,11 +1946,11 @@
         <listitem>
           <para>
             If you use <literal>ALTER TABLE</literal> to change a
-            <literal>MERGE</literal> table to another table type, the
-            mapping to the underlying tables is lost. Instead, the rows
-            from the underlying <literal>MyISAM</literal> tables are
-            copied into the altered table, which is then assigned the
-            new type.
+            <literal>MERGE</literal> table to another storage engine,
+            the mapping to the underlying tables is lost. Instead, the
+            rows from the underlying <literal>MyISAM</literal> tables
+            are copied into the altered table, which is then assigned
+            the new type.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.0/tutorial.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -3278,8 +3278,9 @@
 
       <para>
         A foreign key constraint is not required merely to join two
-        tables. For table types other than <literal>InnoDB</literal>, it
-        is possible when defining a column to use a <literal>REFERENCES
+        tables. For storage engines other than
+        <literal>InnoDB</literal>, it is possible when defining a column
+        to use a <literal>REFERENCES
         <replaceable>tbl_name</replaceable>(<replaceable>col_name</replaceable>)</literal>
         clause, which has no actual effect, and <emphasis>serves only as
         a memo or comment to you that the column which you are currently

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -4877,8 +4877,8 @@
 
     <remark role="todo">
       This is no longer fully accurate. mysqlcheck can be used for some
-      operations on table types other than MyISAM. There probably should
-      be more reference to this program from within the table
+      operations on storage engines other than MyISAM. There probably
+      should be more reference to this program from within the table
       maintenance section.
     </remark>
 
@@ -7451,7 +7451,8 @@
 
             <para>
               Show a column indicating the table type, as in
-              <literal>SHOW FULL TABLES</literal>.
+              <literal>SHOW FULL TABLES</literal>. The type is
+              <literal>BASE TABLE</literal> or <literal>VIEW</literal>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/connector-j.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2606,9 +2606,9 @@
             Foreign Key information (getImported/ExportedKeys() and
             getCrossReference()) is only available from 'InnoDB'-type
             tables. However, the driver uses 'SHOW CREATE TABLE' to
-            retrieve this information, so when other table types support
-            foreign keys, the driver will transparently support them as
-            well.
+            retrieve this information, so when other storage engines
+            support foreign keys, the driver will transparently support
+            them as well.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -5355,7 +5355,7 @@
       </para>
 
       <para>
-        Also, if your server supports transactional table types
+        Also, if your server supports transactional storage engines
         (<literal>InnoDB</literal> and <literal>BDB</literal>) make sure
         the <literal>disable transactions</literal> option is not set
         from the DSN configuration.

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/database-administration.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -3135,8 +3135,8 @@
             </para>
 
             <para>
-              Set the default table type for tables. See
-              <xref linkend="storage-engines"/>.
+              Set the default table type (storage engine) for tables.
+              See <xref linkend="storage-engines"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/functions.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -13898,7 +13898,7 @@
           <para>
             This optimization applies only to <literal>MyISAM</literal>
             tables only, because an exact record count is stored for
-            these table types and can be accessed very quickly. For
+            this storage engine and can be accessed very quickly. For
             transactional storage engines (<literal>InnoDB</literal>,
             <literal>BDB</literal>), storing an exact row count is more
             problematic because multiple transactions may be occurring,

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/innodb.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -64,9 +64,9 @@
       escalation in <literal>InnoDB</literal> because row-level locks in
       <literal>InnoDB</literal> fit in very little space.
       <literal>InnoDB</literal> also supports <literal>FOREIGN
-      KEY</literal> constraints. In SQL queries you can freely mix
-      <literal>InnoDB</literal> type tables with other table types of
-      MySQL, even within the same query.
+      KEY</literal> constraints. You can freely mix
+      <literal>InnoDB</literal> tables with tables from other MySQL
+      storage engines, even within the same statement.
     </para>
 
     <para>
@@ -91,7 +91,8 @@
     <para>
       <literal>InnoDB</literal> is included in binary distributions by
       default. The Windows Essentials installer makes
-      <literal>InnoDB</literal> the MySQL default table type on Windows.
+      <literal>InnoDB</literal> the MySQL default storage engine on
+      Windows.
     </para>
 
     <para>
@@ -1977,7 +1978,7 @@
       TABLE STATUS</literal> statement for any <literal>InnoDB</literal>
       table. The amount of free space in the tablespace appears in the
       <literal>Comment</literal> section in the output of <literal>SHOW
-      TABLE STATUS</literal>. An example:
+      TABLE STATUS</literal>. For example:
     </para>
 
 <programlisting>
@@ -2449,14 +2450,14 @@
 
       <para>
         If MySQL reports an error number 1005 from a <literal>CREATE
-        TABLE</literal> statement, and the error message string refers
-        to errno 150, this means that the table creation failed because
-        a foreign key constraint was not correctly formed. Similarly, if
-        an <literal>ALTER TABLE</literal> fails and it refers to errno
-        150, that means a foreign key definition would be incorrectly
-        formed for the altered table. You can use <literal>SHOW ENGINE
-        INNODB STATUS</literal> to display a detailed explanation of the
-        most recent <literal>InnoDB</literal> foreign key error in the
+        TABLE</literal> statement, and the error message refers to errno
+        150, this means that the table creation failed because a foreign
+        key constraint was not correctly formed. Similarly, if an
+        <literal>ALTER TABLE</literal> fails and it refers to errno 150,
+        that means a foreign key definition would be incorrectly formed
+        for the altered table. You can use <literal>SHOW ENGINE INNODB
+        STATUS</literal> to display a detailed explanation of the most
+        recent <literal>InnoDB</literal> foreign key error in the
         server.
       </para>
 
@@ -2614,7 +2615,7 @@
         Otherwise, the <literal>fk_symbol</literal> value is internally
         generated by <literal>InnoDB</literal> when the foreign key is
         created. To find out the symbol when you want to drop a foreign
-        key, use the <literal>SHOW CREATE TABLE</literal> statement. An
+        key, use the <literal>SHOW CREATE TABLE</literal> statement. For
         example:
       </para>
 
@@ -2756,7 +2757,7 @@
         referencing it. It must have the right column names and types,
         and it must have indexes on the referenced keys, as stated
         earlier. If these are not satisfied, MySQL returns error number
-        1005 and refers to errno 150 in the error message string.
+        1005 and refers to errno 150 in the error message.
       </para>
 
     </section>
@@ -2772,9 +2773,9 @@
       <para>
         MySQL replication works for <literal>InnoDB</literal> tables as
         it does for <literal>MyISAM</literal> tables. It is also
-        possible to use replication in a way where the table type on the
-        slave is not the same as the original table type on the master.
-        For example, you can replicate modifications to an
+        possible to use replication in a way where the storage engine on
+        the slave is not the same as the original storage engine on the
+        master. For example, you can replicate modifications to an
         <literal>InnoDB</literal> table on the master to a
         <literal>MyISAM</literal> table on the slave.
       </para>
@@ -4816,8 +4817,8 @@
 </programlisting>
 
         <para>
-          This tip is valid for inserts into any table type, not just
-          <literal>InnoDB</literal>.
+          This tip is valid for inserts into any storage engine, not
+          just <literal>InnoDB</literal>.
         </para>
       </listitem>
 
@@ -5894,7 +5895,7 @@
           </para>
 
           <para>
-            Cannot create table. If the error message string refers to
+            Cannot create table. If the error message refers to
             <literal>errno</literal> 150, table creation failed because
             a foreign key constraint was not correctly formed.
           </para>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/introduction.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -1468,21 +1468,22 @@
 
         <para>
           As noted, the trade-off for transactional versus
-          non-transactional table types lies mostly in performance.
+          non-transactional storage engines lies mostly in performance.
           Transactional tables have significantly higher memory and disk
           space requirements, and more CPU overhead. On the other hand,
-          transactional table types such as <literal>InnoDB</literal>
-          also offer many significant features. MySQL Server's modular
-          design allows the concurrent use of different storage engines
-          to suit different requirements and deliver optimum performance
-          in all situations.
+          transactional storage engines such as
+          <literal>InnoDB</literal> also offer many significant
+          features. MySQL Server's modular design allows the concurrent
+          use of different storage engines to suit different
+          requirements and deliver optimum performance in all
+          situations.
         </para>
 
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the non-transactional
           <literal>MyISAM</literal> tables, and how do these features
-          compare with the transactional table types?
+          compare with the transactional storage engines?
         </para>
 
         <itemizedlist>

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -494,9 +494,9 @@
       <listitem>
         <para>
           For our sample data, we will use the <literal>world</literal>
-          database which is available for download from the MySQL AB
-          Web site. As this database takes up a relatively small amount
-          of space, we assume that each machine has 256 MB RAM, which
+          database which is available for download from the MySQL AB Web
+          site. As this database takes up a relatively small amount of
+          space, we assume that each machine has 256 MB RAM, which
           should be sufficient for running the operating system, host
           NDB process, and (for the data nodes) for storing the
           database.
@@ -11394,11 +11394,12 @@
 
       <listitem>
         <para>
-          <emphasis>What table types does Cluster support?</emphasis>
+          <emphasis>What storage engines does Cluster
+          support?</emphasis>
         </para>
 
         <para>
-          <literal>NDB</literal> is the only MySQL storage engine which
+          <literal>NDB</literal> is the only MySQL storage engine that
           supports clustering.
         </para>
 

Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/optimization.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -6245,8 +6245,8 @@
       <para>
         For <literal>InnoDB</literal> and <literal>BDB</literal> tables,
         MySQL uses only table locking if you explicitly lock the table
-        with <literal>LOCK TABLES</literal>. For these table types, we
-        recommend that you not use <literal>LOCK TABLES</literal> at
+        with <literal>LOCK TABLES</literal>. For these storage engines,
+        we recommend that you not use <literal>LOCK TABLES</literal> at
         all, because <literal>InnoDB</literal> uses automatic row-level
         locking and <literal>BDB</literal> uses page-level locking to
         ensure transaction isolation.
@@ -9865,14 +9865,14 @@
         </para>
 
         <remark role="todo">
-          Following paras still true for 5.1? [js]
+          Following paras still true for 5.1? [js] (Yes: PD)
         </remark>
 
         <para>
           Symlinks are fully supported only for
-          <literal>MyISAM</literal> tables. For other table types, you
-          may get strange problems if you try to use symbolic links on
-          files in the operating system with any of the preceding
+          <literal>MyISAM</literal> tables. For other storage engines,
+          you may get strange problems if you try to use symbolic links
+          on files in the operating system with any of the preceding
           statements.
         </para>
 

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/problems.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -2708,9 +2708,9 @@
           <para>
             You have found a bug in the data storage code. This isn't
             likely, but it's at least possible. In this case, you can
-            try to change the table type to another storage engine by
-            using <literal>ALTER TABLE</literal> on a repaired copy of
-            the table.
+            try to change the storage engine to another engine by using
+            <literal>ALTER TABLE</literal> on a repaired copy of the
+            table.
           </para>
         </listitem>
 
@@ -3790,7 +3790,7 @@
       </para>
 
       <para>
-        You can check the table type for a table by using either of
+        You can check the storage engine for a table by using either of
         these statements:
       </para>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -1315,7 +1315,7 @@
             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> table type.
+            <literal>BDB</literal> storage engine.
           </para>
         </listitem>
 
@@ -1324,7 +1324,7 @@
             You can add an index on a <literal>BLOB</literal> or
             <literal>TEXT</literal> column only if you are using the
             <literal>MyISAM</literal>, <literal>BDB</literal>, or
-            <literal>InnoDB</literal> table type.
+            <literal>InnoDB</literal> storage engine.
           </para>
         </listitem>
 
@@ -2192,7 +2192,7 @@
           <para>
             You can create special <literal>FULLTEXT</literal> indexes,
             which are used for full-text searches. Only the
-            <literal>MyISAM</literal> table type supports
+            <literal>MyISAM</literal> storage engine supports
             <literal>FULLTEXT</literal> indexes. They can be created
             only from <literal>CHAR</literal>,
             <literal>VARCHAR</literal>, and <literal>TEXT</literal>
@@ -2344,8 +2344,8 @@
             </row>
             <row>
               <entry><literal>MEMORY</literal></entry>
-              <entry>The data for this table type 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. (Known in
+                earlier MySQL versions as <literal>HEAP</literal>.)</entry>
             </row>
             <row>
               <entry><literal>MERGE</literal></entry>
@@ -3899,7 +3899,7 @@
         <replaceable>tbl_name</replaceable></literal> (without a
         <literal>WHERE</literal> clause) in
         <literal>AUTOCOMMIT</literal> mode, the sequence starts over for
-        all table types except <literal>InnoDB</literal> and
+        all storage engines except <literal>InnoDB</literal> and
         <literal>MyISAM</literal>. There are some exceptions to this
         behavior for <literal>InnoDB</literal> tables, as discussed in
         <xref linkend="innodb-auto-increment-column"/>.
@@ -13652,7 +13652,7 @@
 
         <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
-          table types by starting <command>mysqld</command> with the
+          storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
           option; in this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.

Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/storage-engines.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -334,19 +334,19 @@
   </para>
 
   <para>
-    This automatic substitution of the <literal>MyISAM</literal> table
-    type when an unavailable type is specified can be confusing for new
-    MySQL users. A warning is generated whenever a table type is
+    This automatic substitution of the <literal>MyISAM</literal> storage
+    engine when an unavailable engine is specified can be confusing for
+    new MySQL users. A warning is generated whenever a storage engine is
     automatically changed.
   </para>
 
   <para>
     MySQL always creates an <filename>.frm</filename> file to hold the
     table and column definitions. The table's index and data may be
-    stored in one or more other files, depending on the table type. The
-    server creates the <filename>.frm</filename> file above the storage
-    engine level. Individual storage engines create any additional files
-    required for the tables that they manage.
+    stored in one or more other files, depending on the storage engine.
+    The server creates the <filename>.frm</filename> file above the
+    storage engine level. Individual storage engines create any
+    additional files required for the tables that they manage.
   </para>
 
   <para>
@@ -402,9 +402,9 @@
 
   <para>
     Although MySQL supports several transaction-safe storage engines,
-    for best results, you should not mix different table types within a
-    transaction. For information about the problems that can occur if
-    you do this, see <xref linkend="commit"/>.
+    for best results, you should not mix different storage engines
+    within a transaction. For information about the problems that can
+    occur if you do this, see <xref linkend="commit"/>.
   </para>
 
   <para>
@@ -1946,11 +1946,11 @@
         <listitem>
           <para>
             If you use <literal>ALTER TABLE</literal> to change a
-            <literal>MERGE</literal> table to another table type, the
-            mapping to the underlying tables is lost. Instead, the rows
-            from the underlying <literal>MyISAM</literal> tables are
-            copied into the altered table, which is then assigned the
-            new type.
+            <literal>MERGE</literal> table to another storage engine,
+            the mapping to the underlying tables is lost. Instead, the
+            rows from the underlying <literal>MyISAM</literal> tables
+            are copied into the altered table, which is then assigned
+            the new type.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2006-01-09 01:37:50 UTC (rev 729)
+++ trunk/refman-5.1/tutorial.xml	2006-01-09 02:09:54 UTC (rev 730)
@@ -3272,8 +3272,9 @@
 
       <para>
         A foreign key constraint is not required merely to join two
-        tables. For table types other than <literal>InnoDB</literal>, it
-        is possible when defining a column to use a <literal>REFERENCES
+        tables. For storage engines other than
+        <literal>InnoDB</literal>, it is possible when defining a column
+        to use a <literal>REFERENCES
         <replaceable>tbl_name</replaceable>(<replaceable>col_name</replaceable>)</literal>
         clause, which has no actual effect, and <emphasis>serves only as
         a memo or comment to you that the column which you are currently

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