svn commit - mysqldoc@docsrva: r22265 - trunk/dynamic-docs/glossary

[john.russell]

Author: jrussell
Date: 2010-08-16 21:52:12 +0200 (Mon, 16 Aug 2010)
New Revision: 22265

Log:
Make 'composite index' the preferred term, instead of 'concatenated index'.


Modified:
   trunk/dynamic-docs/glossary/innodb.xml


Modified: trunk/dynamic-docs/glossary/innodb.xml
===================================================================
--- trunk/dynamic-docs/glossary/innodb.xml	2010-08-16 19:00:24 UTC (rev 22264)
+++ trunk/dynamic-docs/glossary/innodb.xml	2010-08-16 19:52:12 UTC (rev 22265)
Changed blocks: 7, Lines Added: 25, Lines Deleted: 21; 3610 bytes

@@ -698,7 +698,7 @@
 
     </glossdef>
     <seealso glosid="index" />
-    <seealso glosid="concatenated_index" />
+    <seealso glosid="composite_index" />
   </glossentry>
 
   <glossentry id="compressed_backup">

@@ -808,16 +808,7 @@
 
   <glossentry id="concatenated_index">
     <term>concatenated index</term>
-    <glossdef>
-
-      <para>
-        An <emphasis role="bold">index</emphasis> that includes multiple
-        columns.
-      </para>
-
-    </glossdef>
-    <seealso glosid="index" />
-    <seealso glosid="index_prefix" />
+    <see glosid="composite_index" />
   </glossentry>
 
   <glossentry id="commit">

@@ -873,6 +864,20 @@
     <seealso glosid="redundant_row_format" />
   </glossentry>
 
+  <glossentry id="composite_index">
+    <term>composite index</term>
+    <glossdef>
+
+      <para>
+        An <emphasis role="bold">index</emphasis> that includes multiple
+        columns.
+      </para>
+
+    </glossdef>
+    <seealso glosid="index" />
+    <seealso glosid="index_prefix" />
+  </glossentry>
+
   <glossentry id="compressed_row_format">
     <term>compressed row format</term>
     <glossdef>

@@ -902,14 +907,14 @@
       <para>
         An <emphasis role="bold">index</emphasis> that includes all the
         columns in a query. It could be a <emphasis role="bold">column
-        index</emphasis> or a <emphasis role="bold">concatenated
+        index</emphasis> or a <emphasis role="bold">composite
         index</emphasis>.
       </para>
 
     </glossdef>
     <seealso glosid="index" />
     <seealso glosid="column_index" />
-    <seealso glosid="concatenated_index" />
+    <seealso glosid="composite_index" />
   </glossentry>
 
   <glossentry id="clustered_index">

@@ -1015,13 +1020,13 @@
       <para>
         Cardinality can also apply to the number of distinct values
         present in multiple columns, as in a
-        <emphasis role="bold">concatenated index</emphasis>.
+        <emphasis role="bold">composite index</emphasis>.
       </para>
 
     </glossdef>
     <seealso glosid="random_dive" />
     <seealso glosid="index" />
-    <seealso glosid="concatenated_index" />
+    <seealso glosid="composite_index" />
     <seealso glosid="selectivity" />
   </glossentry>
 

@@ -2537,7 +2542,7 @@
     <seealso glosid="secondary_index" />
     <seealso glosid="b_tree" />
     <seealso glosid="column_index" />
-    <seealso glosid="concatenated_index" />
+    <seealso glosid="composite_index" />
     <seealso glosid="covering_index" />
     <seealso glosid="partial_index" />
   </glossentry>

@@ -2548,17 +2553,16 @@
 
       <para>
         In an <emphasis role="bold">index</emphasis> that applies to
-        multiple columns (known as a <emphasis role="bold">concatenated
+        multiple columns (known as a <emphasis role="bold">composite
         index</emphasis>), the initial or leading columns of the index.
         A query that references the first 1, 2, 3, and so on columns of
-        a <emphasis role="bold">concatenated index</emphasis> can use
-        the index, even if the query does not reference all the columns
-        in the index.
+        a composite index can use the index, even if the query does not
+        reference all the columns in the index.
       </para>
 
     </glossdef>
     <seealso glosid="index" />
-    <seealso glosid="concatenated_index" />
+    <seealso glosid="composite_index" />
   </glossentry>
 
   <glossentry id="innodb">