Author: jstephens
Date: 2008-06-11 15:57:50 +0200 (Wed, 11 Jun 2008)
New Revision: 10932
Log:
Fixes Docs Bug #37140 (Thanks, Jonas!)
Modified:
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/sql-syntax.xml
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 14; 2758 bytes
@@ -2615,13 +2615,34 @@
<entry><literal>HASH</literal>, <literal>BTREE</literal></entry>
</row>
<row>
- <entry><literal>NDB</literal></entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table
+ columns, the <literal>USING</literal> clause can be
+ specified only for a unique index or primary key. In such
+ cases, the <literal>USING HASH</literal> clause prevents
+ the creation of an implicit ordered index. Without
+ <literal>USING HASH</literal>, a statement defining a
+ unique index or primary key automatically results in the
+ creation of a <literal>HASH</literal> index in addition to
+ the ordered index, both of which index the same set of
+ columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only
for <literal>SPATIAL</literal> indexes.
@@ -2644,18 +2665,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the
- <literal>USING HASH</literal> clause prevents the creation
- of an implicit ordered index. Without <literal>USING
- HASH</literal>, a statement defining a unique index or
- primary key automatically results in the creation of a
- <literal>HASH</literal> index in addition to the ordered
- index, both of which index the same set of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal>
is recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 14; 2758 bytes
@@ -2615,13 +2615,34 @@
<entry><literal>HASH</literal>, <literal>BTREE</literal></entry>
</row>
<row>
- <entry><literal>NDB</literal></entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table
+ columns, the <literal>USING</literal> clause can be
+ specified only for a unique index or primary key. In such
+ cases, the <literal>USING HASH</literal> clause prevents
+ the creation of an implicit ordered index. Without
+ <literal>USING HASH</literal>, a statement defining a
+ unique index or primary key automatically results in the
+ creation of a <literal>HASH</literal> index in addition to
+ the ordered index, both of which index the same set of
+ columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only
for <literal>SPATIAL</literal> indexes.
@@ -2644,18 +2665,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the
- <literal>USING HASH</literal> clause prevents the creation
- of an implicit ordered index. Without <literal>USING
- HASH</literal>, a statement defining a unique index or
- primary key automatically results in the creation of a
- <literal>HASH</literal> index in addition to the ordered
- index, both of which index the same set of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal>
is recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/refman-4.1/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 21, Lines Deleted: 13; 2416 bytes
@@ -1496,12 +1496,32 @@
</row>
<row>
<entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table columns,
+ the <literal>USING</literal> clause can be specified only for
+ a unique index or primary key. In such cases, the
+ <literal>USING HASH</literal> clause prevents the creation of
+ an implicit ordered index. Without <literal>USING
+ HASH</literal>, a statement defining a unique index or primary
+ key automatically results in the creation of a
+ <literal>HASH</literal> index in addition to the ordered
+ index, both of which index the same set of columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only for
<literal>SPATIAL</literal> indexes.
@@ -1524,18 +1544,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the <literal>USING
- HASH</literal> clause prevents the creation of an implicit
- ordered index. Without <literal>USING HASH</literal>, a
- statement defining a unique index or primary key automatically
- results in the creation of a <literal>HASH</literal> index in
- addition to the ordered index, both of which index the same set
- of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal> is
recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/refman-5.0/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 22, Lines Deleted: 14; 2547 bytes
@@ -1594,13 +1594,33 @@
<entry><literal>HASH</literal>, <literal>BTREE</literal></entry>
</row>
<row>
- <entry><literal>NDB</literal></entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table columns,
+ the <literal>USING</literal> clause can be specified only for
+ a unique index or primary key. In such cases, the
+ <literal>USING HASH</literal> clause prevents the creation of
+ an implicit ordered index. Without <literal>USING
+ HASH</literal>, a statement defining a unique index or primary
+ key automatically results in the creation of a
+ <literal>HASH</literal> index in addition to the ordered
+ index, both of which index the same set of columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only for
<literal>SPATIAL</literal> indexes.
@@ -1623,18 +1643,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the <literal>USING
- HASH</literal> clause prevents the creation of an implicit
- ordered index. Without <literal>USING HASH</literal>, a
- statement defining a unique index or primary key automatically
- results in the creation of a <literal>HASH</literal> index in
- addition to the ordered index, both of which index the same set
- of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal> is
recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/refman-5.1/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 14; 2749 bytes
@@ -2615,13 +2615,34 @@
<entry><literal>HASH</literal>, <literal>BTREE</literal></entry>
</row>
<row>
- <entry><literal>NDB</literal></entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table
+ columns, the <literal>USING</literal> clause can be
+ specified only for a unique index or primary key. In such
+ cases, the <literal>USING HASH</literal> clause prevents
+ the creation of an implicit ordered index. Without
+ <literal>USING HASH</literal>, a statement defining a
+ unique index or primary key automatically results in the
+ creation of a <literal>HASH</literal> index in addition to
+ the ordered index, both of which index the same set of
+ columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only
for <literal>SPATIAL</literal> indexes.
@@ -2644,18 +2665,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the
- <literal>USING HASH</literal> clause prevents the creation
- of an implicit ordered index. Without <literal>USING
- HASH</literal>, a statement defining a unique index or
- primary key automatically results in the creation of a
- <literal>HASH</literal> index in addition to the ordered
- index, both of which index the same set of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal>
is recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-06-11 10:52:40 UTC (rev 10931)
+++ trunk/refman-6.0/sql-syntax.xml 2008-06-11 13:57:50 UTC (rev 10932)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 14; 2749 bytes
@@ -2555,13 +2555,34 @@
<entry><literal>HASH</literal>, <literal>BTREE</literal></entry>
</row>
<row>
- <entry><literal>NDB</literal></entry>
- <entry><literal>HASH</literal></entry>
+ <entry><literal>NDB</literal> (MySQL 4.1.3 and later)</entry>
+ <entry><literal>HASH</literal>, <literal>BTREE</literal> (see note in text)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+ <note>
+ <para>
+ <literal>BTREE</literal> indexes are implemented by the
+ <literal>NDBCLUSTER</literal> storage engine as T-tree
+ indexes.
+ </para>
+
+ <para>
+ For indexes on <literal>NDBCLUSTER</literal> table
+ columns, the <literal>USING</literal> clause can be
+ specified only for a unique index or primary key. In such
+ cases, the <literal>USING HASH</literal> clause prevents
+ the creation of an implicit ordered index. Without
+ <literal>USING HASH</literal>, a statement defining a
+ unique index or primary key automatically results in the
+ creation of a <literal>HASH</literal> index in addition to
+ the ordered index, both of which index the same set of
+ columns.
+ </para>
+ </note>
+
<para>
The <literal>RTREE</literal> index type is allowable only
for <literal>SPATIAL</literal> indexes.
@@ -2584,18 +2605,6 @@
</programlisting>
<para>
- For indexes on <literal>NDB</literal> table columns, the
- <literal>USING</literal> clause can be specified only for a
- unique index or primary key. In such cases, the
- <literal>USING HASH</literal> clause prevents the creation
- of an implicit ordered index. Without <literal>USING
- HASH</literal>, a statement defining a unique index or
- primary key automatically results in the creation of a
- <literal>HASH</literal> index in addition to the ordered
- index, both of which index the same set of columns.
- </para>
-
- <para>
<literal>TYPE <replaceable>type_name</replaceable></literal>
is recognized as a synonym for <literal>USING
<replaceable>type_name</replaceable></literal>. However,
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10932 - in trunk: it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | jon | 11 Jun |
