Author: paul
Date: 2005-12-13 19:10:37 +0100 (Tue, 13 Dec 2005)
New Revision: 552
Log:
r4742@frost: paul | 2005-12-13 09:24:44 -0600
Update syntax.
Modified:
trunk/
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4737
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1609
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4742
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1609
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2005-12-13 16:59:41 UTC (rev 551)
+++ trunk/refman-4.1/sql-syntax.xml 2005-12-13 18:10:37 UTC (rev 552)
@@ -131,8 +131,8 @@
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
- UNIQUE [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
- | ADD [FULLTEXT|SPATIAL] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ UNIQUE [INDEX] [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ | ADD [FULLTEXT|SPATIAL] [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>reference_definition</replaceable>]
@@ -1170,7 +1170,7 @@
</para>
<para>
- <literal>FULLTEXT</literal> indexes can index only
+ <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>
@@ -1179,7 +1179,7 @@
</para>
<para>
- <literal>SPATIAL</literal> indexes can index only spatial
+ <literal>SPATIAL</literal> indexes can include only spatial
columns, and only in <literal>MyISAM</literal> tables.
<literal>SPATIAL</literal> indexes are available in MySQL 4.1 or
later. Spatial column types are described in
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2005-12-13 16:59:41 UTC (rev 551)
+++ trunk/refman-5.0/sql-syntax.xml 2005-12-13 18:10:37 UTC (rev 552)
@@ -139,8 +139,8 @@
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
- UNIQUE [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
- | ADD [FULLTEXT|SPATIAL] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ UNIQUE [INDEX] [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ | ADD [FULLTEXT|SPATIAL] [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>reference_definition</replaceable>]
@@ -1189,7 +1189,7 @@
</para>
<para>
- <literal>FULLTEXT</literal> indexes can index only
+ <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. See
@@ -1197,7 +1197,7 @@
</para>
<para>
- <literal>SPATIAL</literal> indexes can index only spatial
+ <literal>SPATIAL</literal> indexes can include only spatial
columns, and only in <literal>MyISAM</literal> tables. Spatial
column types are described in
<xref linkend="spatial-extensions"/>.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r552 - in trunk: . refman-4.1 refman-5.0 | paul | 13 Dec |
