svn commit - mysqldoc@docsrva: r2123 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-05-18 22:20:15 +0200 (Thu, 18 May 2006)
New Revision: 2123

Log:
 r7606@polar:  paul | 2006-05-18 14:14:22 -0500
 Slight reorganization of CREATE INDEX material.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7586
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10508
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7606
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10508
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-05-18 13:39:09 UTC (rev 2122)
+++ trunk/refman-4.1/sql-syntax.xml	2006-05-18 20:20:15 UTC (rev 2123)
@@ -1137,6 +1137,24 @@
       </para>
 
       <para>
+        <literal>FULLTEXT</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only
+        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+        <literal>TEXT</literal> columns.
<literal>FULLTEXT</literal>
+        indexes are available in MySQL 3.23.23 or later. See
+        <xref linkend="fulltext-search"/>.
+      </para>
+
+      <para>
+        <literal>SPATIAL</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only spatial
+        columns that are defined as <literal>NOT NULL</literal>.
+        <literal>SPATIAL</literal> indexes are available in MySQL 4.1 or
+        later. <xref linkend="spatial-extensions"/>, describes the
+        spatial data types.
+      </para>
+
+      <para>
         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>,
@@ -1210,11 +1228,7 @@
         be used as a synonym for <literal>USING
         <replaceable>type_name</replaceable></literal> to specify an
         index type. However, <literal>USING</literal> is the preferred
-        form. In addition, the index name that precedes the index type
-        in the index specification syntax is not optional with
-        <literal>TYPE</literal>: Unlike <literal>USING</literal>,
-        <literal>TYPE</literal> is not a reserved word and is
-        interpreted as the index name if no name is given.
+        form.
       </para>
 
       <para>
@@ -1224,33 +1238,6 @@
         uses the available type.
       </para>
 
-      <para>
-        <literal>FULLTEXT</literal> indexes can include only
-        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-        <literal>TEXT</literal> columns, and only in
-        <literal>MyISAM</literal> tables.
<literal>FULLTEXT</literal>
-        indexes are available in MySQL 3.23.23 or later.
-        <xref linkend="fulltext-search"/>.
-      </para>
-
-      <para>
-        <literal>FULLTEXT</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only
-        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-        <literal>TEXT</literal> columns.
<literal>FULLTEXT</literal>
-        indexes are available in MySQL 3.23.23 or later. See
-        <xref linkend="fulltext-search"/>.
-      </para>
-
-      <para>
-        <literal>SPATIAL</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only spatial
-        columns that are defined as <literal>NOT NULL</literal>.
-        <literal>SPATIAL</literal> indexes are available in MySQL 4.1 or
-        later. <xref linkend="spatial-extensions"/>, describes the
-        spatial data types.
-      </para>
-
     </section>
 
     <section id="create-table">

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-05-18 13:39:09 UTC (rev 2122)
+++ trunk/refman-5.0/sql-syntax.xml	2006-05-18 20:20:15 UTC (rev 2123)
@@ -1165,6 +1165,22 @@
       </para>
 
       <para>
+        <literal>FULLTEXT</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only
+        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+        <literal>TEXT</literal> columns. See
+        <xref linkend="fulltext-search"/>.
+      </para>
+
+      <para>
+        <literal>SPATIAL</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only spatial
+        columns that are defined as <literal>NOT NULL</literal>.
+        <xref linkend="spatial-extensions"/>, describes the spatial data
+        types.
+      </para>
+
+      <para>
         In MySQL &current-series;:
       </para>
 
@@ -1251,11 +1267,7 @@
         be used as a synonym for <literal>USING
         <replaceable>type_name</replaceable></literal> to specify an
         index type. However, <literal>USING</literal> is the preferred
-        form. In addition, the index name that precedes the index type
-        in the index specification syntax is not optional with
-        <literal>TYPE</literal>: Unlike <literal>USING</literal>,
-        <literal>TYPE</literal> is not a reserved word and is
-        interpreted as the index name if no name is given.
+        form.
       </para>
 
       <para>
@@ -1265,22 +1277,6 @@
         uses the available type.
       </para>
 
-      <para>
-        <literal>FULLTEXT</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only
-        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-        <literal>TEXT</literal> columns. See
-        <xref linkend="fulltext-search"/>.
-      </para>
-
-      <para>
-        <literal>SPATIAL</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only spatial
-        columns that are defined as <literal>NOT NULL</literal>.
-        <xref linkend="spatial-extensions"/>, describes the spatial data
-        types.
-      </para>
-
     </section>
 
     <section id="create-table">

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-05-18 13:39:09 UTC (rev 2122)
+++ trunk/refman-5.1/sql-syntax.xml	2006-05-18 20:20:15 UTC (rev 2123)
@@ -1630,6 +1630,22 @@
       </para>
 
       <para>
+        <literal>FULLTEXT</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only
+        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+        <literal>TEXT</literal> columns. See
+        <xref linkend="fulltext-search"/>.
+      </para>
+
+      <para>
+        <literal>SPATIAL</literal> indexes are supported only for
+        <literal>MyISAM</literal> tables and can include only spatial
+        columns that are defined as <literal>NOT NULL</literal>.
+        <xref linkend="spatial-extensions"/>, describes the spatial data
+        types.
+      </para>
+
+      <para>
         In MySQL &current-series;:
       </para>
 
@@ -1716,11 +1732,7 @@
         be used as a synonym for <literal>USING
         <replaceable>type_name</replaceable></literal> to specify an
         index type. However, <literal>USING</literal> is the preferred
-        form. In addition, the index name that precedes the index type
-        in the index specification syntax is not optional with
-        <literal>TYPE</literal>: Unlike <literal>USING</literal>,
-        <literal>TYPE</literal> is not a reserved word and is
-        interpreted as the index name if no name is given.
+        form.
       </para>
 
       <para>
@@ -1731,26 +1743,13 @@
       </para>
 
       <para>
-        <literal>FULLTEXT</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only
-        <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-        <literal>TEXT</literal> columns. See
-        <xref linkend="fulltext-search"/>. A <literal>WITH
+        For <literal>FULLTEXT</literal> indexes, a <literal>WITH
         PARSER</literal> clause can be specified to associate a parser
         plugin with the index if full-text indexing and searching
-        operations need special handling. This clause is legal only for
-        <literal>FULLTEXT</literal> indexes. See
+        operations need special handling. See
         <xref linkend="plugin-api"/>, for details on creating plugins.
       </para>
 
-      <para>
-        <literal>SPATIAL</literal> indexes are supported only for
-        <literal>MyISAM</literal> tables and can include only spatial
-        columns that are defined as <literal>NOT NULL</literal>.
-        <xref linkend="spatial-extensions"/>, describes the spatial data
-        types.
-      </para>
-
     </section>
 
     <section id="create-table">