List:Commits« Previous MessageNext Message »
From:paul Date:February 21 2006 1:08am
Subject:svn commit - mysqldoc@docsrva: r1411 - in trunk: . refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-02-21 02:08:47 +0100 (Tue, 21 Feb 2006)
New Revision: 1411

Log:
 r7996@frost:  paul | 2006-02-20 19:07:40 -0600
 The TYPE table option is no longer supported as a synonym for
 ENGINE in 5.1.


Modified:
   trunk/
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/storage-engines.xml
   trunk/refman-common/news-5.1.xml


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

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-02-20 20:51:37 UTC (rev 1410)
+++ trunk/refman-5.1/innodb.xml	2006-02-21 01:08:47 UTC (rev 1411)
@@ -1926,13 +1926,6 @@
 </programlisting>
 
     <para>
-      The older term <literal>TYPE</literal> is supported as a synonym
-      for <literal>ENGINE</literal> for backward compatibility, but
-      <literal>ENGINE</literal> is the preferred term and
-      <literal>TYPE</literal> is deprecated.
-    </para>
-
-    <para>
       The statement creates a table and an index on column
       <literal>a</literal> in the <literal>InnoDB</literal> tablespace
       that consists of the data files that you specified in

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-02-20 20:51:37 UTC (rev 1410)
+++ trunk/refman-5.1/installing.xml	2006-02-21 01:08:47 UTC (rev 1411)
@@ -11938,6 +11938,18 @@
 
         <listitem>
           <para>
+            <emphasis role="bold">Incompatible change</emphasis>: As of
+            MySQL 5.1.7, <literal>TYPE =
+            <replaceable>engine_name</replaceable></literal> is no
+            longer accepted as a synonym for the <literal>ENGINE =
+            <replaceable>engine_name</replaceable></literal> table
+            option. (<literal>TYPE</literal> has been deprecated since
+            MySQL 4.0.)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <emphasis role="bold">Incompatible change:</emphasis> The
             namespace for triggers has changed in MySQL 5.0.10.
             Previously, trigger names had to be unique per table. Now

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-02-20 20:51:37 UTC (rev 1410)
+++ trunk/refman-5.1/sql-syntax.xml	2006-02-21 01:08:47 UTC (rev 1411)
@@ -1471,12 +1471,12 @@
       <remark role="help-topic" condition="CREATE TABLE"/>
 
       <remark role="help-keywords">
-        ENGINE TYPE KEY CREATE DATA ACTION ARCHIVE AVG_ROW_LENGTH
-        BERKELEYDB BDB BY CASCADE CHECK CHECKSUM COMMENT COMPACT
-        CONSTRAINT COMPRESSED CONNECTION CSV FEDERATED FIXED DYNAMIC
-        DEFAULT DELAY_KEY_WRITE DELETE DIRECTORY INDEX FIRST FOREIGN
-        ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD
-        MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL MERGE MRG_MYISAM MYISAM NDB
+        ENGINE KEY CREATE DATA ACTION ARCHIVE AVG_ROW_LENGTH BERKELEYDB
+        BDB BY CASCADE CHECK CHECKSUM COMMENT COMPACT CONSTRAINT
+        COMPRESSED CONNECTION CSV FEDERATED FIXED DYNAMIC DEFAULT
+        DELAY_KEY_WRITE DELETE DIRECTORY INDEX FIRST FOREIGN ROW_FORMAT
+        FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD MAX_ROWS
+        MIN_ROWS PACK_KEYS PARTIAL MERGE MRG_MYISAM MYISAM NDB
         NDBCLUSTER NO REDUNDANT REFERENCES SERIAL WITH PARSER
       </remark>
 
@@ -1563,7 +1563,7 @@
 <replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
 
 <replaceable>table_option</replaceable>:
-    {ENGINE|TYPE} [=] <replaceable>engine_name</replaceable>
+    ENGINE [=] <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>]
@@ -2247,8 +2247,7 @@
 
       <para>
         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.
+        engine for the table.
       </para>
 
       <para>
@@ -3687,49 +3686,54 @@
         such as stored routines and events. Finally, the server drops
         the old database.
       </para>
-      
+
       <para>
-        <emphasis role="bold">Note that currently there are these limitations:</emphasis>
+        <emphasis role="bold">Note that currently there are these
+        limitations:</emphasis>
+
         <itemizedlist>
+
           <listitem>
             <para>
-              <literal>RENAME DATABASE</literal> does not change any account
-              privileges listed in the system tables. This needs to be changed
-              manually.
+              <literal>RENAME DATABASE</literal> does not change any
+              account privileges listed in the system tables. This needs
+              to be changed manually.
             </para>
           </listitem>
+
           <listitem>
             <para>
-              <literal>RENAME DATABASE</literal> does not migrate any stored
-              routines or events to the new schema name. This means that:
+              <literal>RENAME DATABASE</literal> does not migrate any
+              stored routines or events to the new schema name. This
+              means that:
+
               <itemizedlist>
-                
+
                 <listitem>
                   <para>
-                    For stored routines, it does not change any values in the
-                    <literal>ROUTINE_SCHEMA</literal> column of the
-                    <literal>INFORMATION_SCHEMA.ROUTINES</literal> table, or in
-                    the <literal>db</literal> column of the
+                    For stored routines, it does not change any values
+                    in the <literal>ROUTINE_SCHEMA</literal> column of
+                    the <literal>INFORMATION_SCHEMA.ROUTINES</literal>
+                    table, or in the <literal>db</literal> column of the
                     <literal>mysql.proc</literal> table.
                   </para>
                 </listitem>
-                
+
                 <listitem>
                   <para>
                     For events, it does not change any values in the
                     <literal>EVENT_SCHEMA</literal> column of the
-                    <literal>INFORMATION_SCHEMA.EVENTS</literal> table, or in
-                    the <literal>db</literal> column of the
+                    <literal>INFORMATION_SCHEMA.EVENTS</literal> table,
+                    or in the <literal>db</literal> column of the
                     <literal>mysql.event</literal> table.
                   </para>
                 </listitem>
-                
+
               </itemizedlist>
-              
             </para>
           </listitem>
+
         </itemizedlist>
-        
       </para>
 
       <remark role="help-description-end"/>

Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-02-20 20:51:37 UTC (rev 1410)
+++ trunk/refman-5.1/storage-engines.xml	2006-02-21 01:08:47 UTC (rev 1411)
@@ -255,35 +255,18 @@
 
   <para>
     When you create a new table, you can specify which storage engine to
-    use by adding an <literal>ENGINE</literal> or
-    <literal>TYPE</literal> table option to the <literal>CREATE
-    TABLE</literal> statement:
+    use by adding an <literal>ENGINE</literal> table option to the
+    <literal>CREATE TABLE</literal> statement:
   </para>
 
 <programlisting>
 CREATE TABLE t (i INT) ENGINE = INNODB;
-CREATE TABLE t (i INT) TYPE = MEMORY;
 </programlisting>
 
-  <remark role="note">
-    The following paragraph also appears in sections for individual
-    storage engines, but only for those in existence at the time of the
-    switch from TYPE to ENGINE (MySQL 4.0.18). For newer engines, the
-    paragraph does not appear; there is no reason to give people an
-    encouragement to use TYPE.
-  </remark>
-
   <para>
-    The older term <literal>TYPE</literal> is supported as a synonym for
-    <literal>ENGINE</literal> for backward compatibility, but
-    <literal>ENGINE</literal> is the preferred term and
-    <literal>TYPE</literal> is deprecated.
-  </para>
-
-  <para>
-    If you omit the <literal>ENGINE</literal> or <literal>TYPE</literal>
-    option, the default storage engine is used. Normally, this is
-    <literal>MyISAM</literal>, but you can change it by using the
+    If you omit the <literal>ENGINE</literal> option, the default
+    storage engine is used. Normally, this is <literal>MyISAM</literal>,
+    but you can change it by using the
     <option>--default-storage-engine</option> or
     <option>--default-table-type</option> server startup option, or by
     setting the <literal>storage_engine</literal> or
@@ -298,13 +281,13 @@
   </para>
 
   <para>
-    To convert a table from one type to another, use an <literal>ALTER
-    TABLE</literal> statement that indicates the new type:
+    To convert a table from one storage engine to another, use an
+    <literal>ALTER TABLE</literal> statement that indicates the new
+    engine:
   </para>
 
 <programlisting>
 ALTER TABLE t ENGINE = MYISAM;
-ALTER TABLE t TYPE = BDB;
 </programlisting>
 
   <para>
@@ -481,13 +464,6 @@
 </programlisting>
 
     <para>
-      The older term <literal>TYPE</literal> is supported as a synonym
-      for <literal>ENGINE</literal> for backward compatibility, but
-      <literal>ENGINE</literal> is the preferred term and
-      <literal>TYPE</literal> is deprecated.
-    </para>
-
-    <para>
       Normally, it is unnecesary to use <literal>ENGINE</literal> to
       specify the <literal>MyISAM</literal> storage engine.
       <literal>MyISAM</literal> is the default engine unless the default
@@ -1704,13 +1680,6 @@
 </programlisting>
 
     <para>
-      The older term <literal>TYPE</literal> is supported as a synonym
-      for <literal>ENGINE</literal> for backward compatibility, but
-      <literal>ENGINE</literal> is the preferred term and
-      <literal>TYPE</literal> is deprecated.
-    </para>
-
-    <para>
       Note that the <literal>a</literal> column is indexed as a
       <literal>PRIMARY KEY</literal> in the underlying
       <literal>MyISAM</literal> tables, but not in the
@@ -2122,13 +2091,6 @@
 </programlisting>
 
     <para>
-      The older term <literal>TYPE</literal> is supported as a synonym
-      for <literal>ENGINE</literal> for backward compatibility, but
-      <literal>ENGINE</literal> is the preferred term and
-      <literal>TYPE</literal> is deprecated.
-    </para>
-
-    <para>
       As indicated by the name, <literal>MEMORY</literal> tables are
       stored in memory. They use hash indexes by default, which makes
       them very fast, and very useful for creating temporary tables.
@@ -2949,13 +2911,6 @@
 </programlisting>
 
       <para>
-        The older term <literal>TYPE</literal> is supported as a synonym
-        for <literal>ENGINE</literal> for backward compatibility, but
-        <literal>ENGINE</literal> is the preferred term and
-        <literal>TYPE</literal> is deprecated.
-      </para>
-
-      <para>
         <literal>BerkeleyDB</literal> is a synonym for
         <literal>BDB</literal> in the <literal>ENGINE</literal> table
         option.

Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml	2006-02-20 20:51:37 UTC (rev 1410)
+++ trunk/refman-common/news-5.1.xml	2006-02-21 01:08:47 UTC (rev 1411)
@@ -83,6 +83,17 @@
 
       <listitem>
         <para>
+          <emphasis role="bold">Incompatible change</emphasis>:
+          <literal>TYPE =
+          <replaceable>engine_name</replaceable></literal> is no longer
+          accepted as a synonym for the <literal>ENGINE =
+          <replaceable>engine_name</replaceable></literal> table option.
+          (<literal>TYPE</literal> has been deprecated since MySQL 4.0.)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Added the <command>mysql_upgrade</command> program that checks
           all tables for incompatibilities with the current version of
           MySQL Server and repairs them if necessary. This program

Thread
svn commit - mysqldoc@docsrva: r1411 - in trunk: . refman-5.1 refman-commonpaul21 Feb