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

[jon]

Author: jstephens
Date: 2007-05-05 15:23:30 +0200 (Sat, 05 May 2007)
New Revision: 6346

Log:

USING HASH and NDB (Thanks, Roland!)



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


Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2007-05-05 06:36:37 UTC (rev 6345)
+++ trunk/refman-4.1/sql-syntax.xml	2007-05-05 13:23:30 UTC (rev 6346)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 0; 1497 bytes

@@ -1416,6 +1416,10 @@
              
<entry><literal>MEMORY</literal>/<literal>HEAP</literal></entry>
               <entry><literal>HASH</literal>,
<literal>BTREE</literal></entry>
             </row>
+            <row>
+              <entry><literal>NDB</literal> (MySQL 4.1.3 and
later)</entry>
+              <entry><literal>HASH</literal></entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>

@@ -1435,6 +1439,18 @@
 CREATE TABLE lookup (id INT) ENGINE = MEMORY;
 CREATE INDEX id_index USING BTREE ON lookup (id);
 </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


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2007-05-05 06:36:37 UTC (rev 6345)
+++ trunk/refman-5.0/sql-syntax.xml	2007-05-05 13:23:30 UTC (rev 6346)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 0; 1475 bytes

@@ -1471,6 +1471,10 @@
              
<entry><literal>MEMORY</literal>/<literal>HEAP</literal></entry>
               <entry><literal>HASH</literal>,
<literal>BTREE</literal></entry>
             </row>
+            <row>
+              <entry><literal>NDB</literal></entry>
+              <entry><literal>HASH</literal></entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>

@@ -1490,6 +1494,18 @@
 CREATE TABLE lookup (id INT) ENGINE = MEMORY;
 CREATE INDEX id_index USING BTREE ON lookup (id);
 </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


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2007-05-05 06:36:37 UTC (rev 6345)
+++ trunk/refman-5.1/sql-syntax.xml	2007-05-05 13:23:30 UTC (rev 6346)
Changed blocks: 3, Lines Added: 18, Lines Deleted: 2; 2074 bytes

@@ -2057,6 +2057,10 @@
                  
<entry><literal>MEMORY</literal>/<literal>HEAP</literal></entry>
                   <entry><literal>HASH</literal>,
<literal>BTREE</literal></entry>
                 </row>
+                <row>
+                  <entry><literal>NDB</literal></entry>
+                  <entry><literal>HASH</literal></entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>

@@ -2076,6 +2080,18 @@
 CREATE TABLE lookup (id INT) ENGINE = MEMORY;
 CREATE INDEX id_index USING BTREE ON lookup (id);
 </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>

@@ -2088,8 +2104,8 @@
             Note: Before MySQL 5.1.10, this option can be given only
             before the <literal>ON
             <replaceable>tbl_name</replaceable></literal> clause. Use
of
-            the option in this position is deprecated as of 5.1.10 and
-            will no longer be supported from MySQL 5.3 on.
+            the option in this position is deprecated as of 5.1.10;
+            support for it is to be dropped in a future MySQL release.
           </para>
         </listitem>